diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 4900703f..a8959314 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -591,8 +591,8 @@ public:
       if (!l && !r)
 	return false;
 
-      string r1 = ir::get_pretty_representation(l),
-	r2 = ir::get_pretty_representation(r);
+      string r1 = ir::get_pretty_representation(l, true),
+	r2 = ir::get_pretty_representation(r, true);
 
       if (r1 == r2)
 	{
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index ae62b7ac..d80d3d75 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1014,13 +1014,6 @@
     <typedef-decl name='DBusFreeFunction' type-id='type-id-63' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
     <!-- typedef void (void*)* DBusWakeupMainFunction -->
     <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-63' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='135' column='1' id='type-id-37'/>
-    <!-- enum __anonymous_enum__ -->
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='80' column='1' id='type-id-61'>
-      <underlying-type type-id='type-id-42'/>
-      <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
-      <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
-      <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
-    </enum-decl>
     <!-- struct DBusAtomic -->
     <class-decl name='DBusAtomic' size-in-bits='32' is-struct='yes' visibility='default' filepath='../dbus/dbus-sysdeps.h' line='228' column='1' id='type-id-59'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1039,6 +1032,13 @@
         <var-decl name='n_slots' type-id='type-id-2' visibility='default' filepath='../dbus/dbus-dataslot.h' line='72' column='1'/>
       </data-member>
     </class-decl>
+    <!-- enum __anonymous_enum__ -->
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='80' column='1' id='type-id-61'>
+      <underlying-type type-id='type-id-42'/>
+      <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
+      <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
+      <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
+    </enum-decl>
     <!-- typedef DBusCMutex DBusCMutex -->
     <typedef-decl name='DBusCMutex' type-id='type-id-66' filepath='../dbus/dbus-threads-internal.h' line='45' column='1' id='type-id-49'/>
     <!-- typedef DBusCondVar DBusCondVar -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index f9eed018..7c977b1d 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -739,6 +739,8 @@
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
     <!-- void (const GLfloat*, void*)* -->
     <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-24'/>
+    <!-- struct CurveMap -->
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-29'/>
     <!-- float -->
     <type-decl name='float' size-in-bits='32' id='type-id-28'/>
     <!-- void (const GLfloat*) -->
@@ -761,8 +763,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-11'/>
     <!-- long int -->
     <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
-    <!-- struct CurveMap -->
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-29'/>
     <!-- typedef float GLfloat -->
     <typedef-decl name='GLfloat' type-id='type-id-28' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-32'/>
     <!-- unsigned long int -->
@@ -1744,212 +1744,6 @@
     </array-type-def>
     <!-- bezierPatchMesh* -->
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-51'/>
-    <!-- class NurbsTessellator -->
-    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
-      <data-member access='protected' layout-offset-in-bits='64'>
-        <!-- Renderhints NurbsTessellator::renderhints -->
-        <var-decl name='renderhints' type-id='type-id-70' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='320'>
-        <!-- Maplist NurbsTessellator::maplist -->
-        <var-decl name='maplist' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='3008'>
-        <!-- Backend NurbsTessellator::backend -->
-        <var-decl name='backend' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='3648'>
-        <!-- Subdivider NurbsTessellator::subdivider -->
-        <var-decl name='subdivider' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='24064'>
-        <!-- JumpBuffer* NurbsTessellator::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='24128'>
-        <!-- Pool NurbsTessellator::o_pwlcurvePool -->
-        <var-decl name='o_pwlcurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='26624'>
-        <!-- Pool NurbsTessellator::o_nurbscurvePool -->
-        <var-decl name='o_nurbscurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='29120'>
-        <!-- Pool NurbsTessellator::o_curvePool -->
-        <var-decl name='o_curvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='31616'>
-        <!-- Pool NurbsTessellator::o_trimPool -->
-        <var-decl name='o_trimPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='34112'>
-        <!-- Pool NurbsTessellator::o_surfacePool -->
-        <var-decl name='o_surfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='36608'>
-        <!-- Pool NurbsTessellator::o_nurbssurfacePool -->
-        <var-decl name='o_nurbssurfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='39104'>
-        <!-- Pool NurbsTessellator::propertyPool -->
-        <var-decl name='propertyPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='41600'>
-        <!-- Pool NurbsTessellator::quiltPool -->
-        <var-decl name='quiltPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='44096'>
-        <!-- TrimVertexPool NurbsTessellator::extTrimVertexPool -->
-        <var-decl name='extTrimVertexPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46720'>
-        <!-- int NurbsTessellator::inSurface -->
-        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46752'>
-        <!-- int NurbsTessellator::inCurve -->
-        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46784'>
-        <!-- int NurbsTessellator::inTrim -->
-        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46816'>
-        <!-- int NurbsTessellator::isCurveModified -->
-        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46848'>
-        <!-- int NurbsTessellator::isTrimModified -->
-        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46880'>
-        <!-- int NurbsTessellator::isSurfaceModified -->
-        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46912'>
-        <!-- int NurbsTessellator::isDataValid -->
-        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46944'>
-        <!-- int NurbsTessellator::numTrims -->
-        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46976'>
-        <!-- int NurbsTessellator::playBack -->
-        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47040'>
-        <!-- O_trim** NurbsTessellator::nextTrim -->
-        <var-decl name='nextTrim' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47104'>
-        <!-- O_curve** NurbsTessellator::nextCurve -->
-        <var-decl name='nextCurve' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47168'>
-        <!-- O_nurbscurve** NurbsTessellator::nextNurbscurve -->
-        <var-decl name='nextNurbscurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47232'>
-        <!-- O_pwlcurve** NurbsTessellator::nextPwlcurve -->
-        <var-decl name='nextPwlcurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47296'>
-        <!-- O_nurbssurface** NurbsTessellator::nextNurbssurface -->
-        <var-decl name='nextNurbssurface' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47360'>
-        <!-- O_surface* NurbsTessellator::currentSurface -->
-        <var-decl name='currentSurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47424'>
-        <!-- O_trim* NurbsTessellator::currentTrim -->
-        <var-decl name='currentTrim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47488'>
-        <!-- O_curve* NurbsTessellator::currentCurve -->
-        <var-decl name='currentCurve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47552'>
-        <!-- DisplayList* NurbsTessellator::dl -->
-        <var-decl name='dl' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- NurbsTessellator::NurbsTessellator(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
-        <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- parameter of type 'BasicCurveEvaluator&' -->
-          <parameter type-id='type-id-87'/>
-          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
-          <parameter type-id='type-id-88'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <!-- NurbsTessellator::~NurbsTessellator(int) -->
-        <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <!-- void NurbsTessellator::bgnrender() -->
-        <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <!-- void NurbsTessellator::endrender() -->
-        <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <!-- void NurbsTessellator::makeobj(int) -->
-        <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <!-- void NurbsTessellator::closeobj() -->
-        <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <!-- void NurbsTessellator::errorHandler(int) -->
-        <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- const GLint* -->
-    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-62'/>
     <!-- struct BasicSurfaceEvaluator -->
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-48'>
       <!-- class CachingEvaluator -->
@@ -1958,7 +1752,7 @@
         <!-- BasicSurfaceEvaluator::~BasicSurfaceEvaluator(int) -->
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -1969,7 +1763,7 @@
         <!-- void BasicSurfaceEvaluator::range2f(long int, REAL*, REAL*) -->
         <function-decl name='range2f' mangled-name='_ZN21BasicSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/internals/basicsurfeval.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
@@ -1984,7 +1778,7 @@
         <!-- void BasicSurfaceEvaluator::domain2f(REAL, REAL, REAL, REAL) -->
         <function-decl name='domain2f' mangled-name='_ZN21BasicSurfaceEvaluator8domain2fEffff' filepath='libnurbs/internals/basicsurfeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2001,7 +1795,7 @@
         <!-- void BasicSurfaceEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN21BasicSurfaceEvaluator6enableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -2012,7 +1806,7 @@
         <!-- void BasicSurfaceEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN21BasicSurfaceEvaluator7disableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -2023,7 +1817,7 @@
         <!-- void BasicSurfaceEvaluator::bgnmap2f(long int) -->
         <function-decl name='bgnmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/internals/basicsurfeval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -2034,7 +1828,7 @@
         <!-- void BasicSurfaceEvaluator::map2f(long int, REAL, REAL, long int, long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map2f' mangled-name='_ZN21BasicSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/internals/basicsurfeval.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2063,7 +1857,7 @@
         <!-- void BasicSurfaceEvaluator::mapgrid2f(long int, REAL, REAL, long int, REAL, REAL) -->
         <function-decl name='mapgrid2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/internals/basicsurfeval.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2084,7 +1878,7 @@
         <!-- void BasicSurfaceEvaluator::mapmesh2f(long int, long int, long int, long int, long int) -->
         <function-decl name='mapmesh2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/internals/basicsurfeval.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
@@ -2103,7 +1897,7 @@
         <!-- void BasicSurfaceEvaluator::evalcoord2f(long int, REAL, REAL) -->
         <function-decl name='evalcoord2f' mangled-name='_ZN21BasicSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/internals/basicsurfeval.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2118,7 +1912,7 @@
         <!-- void BasicSurfaceEvaluator::evalpoint2i(long int, long int) -->
         <function-decl name='evalpoint2i' mangled-name='_ZN21BasicSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/internals/basicsurfeval.cc' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
@@ -2131,7 +1925,7 @@
         <!-- void BasicSurfaceEvaluator::endmap2f() -->
         <function-decl name='endmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8endmap2fEv' filepath='libnurbs/internals/basicsurfeval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2140,7 +1934,7 @@
         <!-- void BasicSurfaceEvaluator::polymode(long int) -->
         <function-decl name='polymode' mangled-name='_ZN21BasicSurfaceEvaluator8polymodeEl' filepath='libnurbs/internals/basicsurfeval.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -2151,7 +1945,7 @@
         <!-- void BasicSurfaceEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN21BasicSurfaceEvaluator7bgnlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2160,7 +1954,7 @@
         <!-- void BasicSurfaceEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN21BasicSurfaceEvaluator7endlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2169,7 +1963,7 @@
         <!-- void BasicSurfaceEvaluator::bgnclosedline() -->
         <function-decl name='bgnclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2178,7 +1972,7 @@
         <!-- void BasicSurfaceEvaluator::endclosedline() -->
         <function-decl name='endclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2187,7 +1981,7 @@
         <!-- void BasicSurfaceEvaluator::bgntmesh() -->
         <function-decl name='bgntmesh' mangled-name='_ZN21BasicSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2196,7 +1990,7 @@
         <!-- void BasicSurfaceEvaluator::swaptmesh() -->
         <function-decl name='swaptmesh' mangled-name='_ZN21BasicSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2205,7 +1999,7 @@
         <!-- void BasicSurfaceEvaluator::endtmesh() -->
         <function-decl name='endtmesh' mangled-name='_ZN21BasicSurfaceEvaluator8endtmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2214,7 +2008,7 @@
         <!-- void BasicSurfaceEvaluator::bgnqstrip() -->
         <function-decl name='bgnqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2223,7 +2017,7 @@
         <!-- void BasicSurfaceEvaluator::endqstrip() -->
         <function-decl name='endqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9endqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2232,7 +2026,7 @@
         <!-- void BasicSurfaceEvaluator::bgntfan() -->
         <function-decl name='bgntfan' mangled-name='_ZN21BasicSurfaceEvaluator7bgntfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2241,7 +2035,7 @@
         <!-- void BasicSurfaceEvaluator::endtfan() -->
         <function-decl name='endtfan' mangled-name='_ZN21BasicSurfaceEvaluator7endtfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2250,7 +2044,7 @@
         <!-- void BasicSurfaceEvaluator::evalUStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalUStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2271,7 +2065,7 @@
         <!-- void BasicSurfaceEvaluator::evalVStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalVStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2292,7 +2086,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE' mangled-name='_ZN21BasicSurfaceEvaluator18inDoEvalCoord2NOGEEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2309,7 +2103,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE_BU(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BU' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BUEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2326,7 +2120,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE_BV(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BV' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BVEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -2343,7 +2137,7 @@
         <!-- void BasicSurfaceEvaluator::inPreEvaluateBV_intfac(REAL) -->
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
@@ -2354,7 +2148,7 @@
         <!-- void BasicSurfaceEvaluator::inPreEvaluateBU_intfac(REAL) -->
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
@@ -2362,95 +2156,345 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef unsigned char GLboolean -->
-    <typedef-decl name='GLboolean' type-id='type-id-91' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-45'/>
-    <!-- typedef unsigned int GLenum -->
-    <typedef-decl name='GLenum' type-id='type-id-92' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-59'/>
-    <!-- typedef int GLint -->
-    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-63'/>
-    <!-- typedef void ()* _GLUfuncptr -->
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-60'/>
-    <!-- typedef void (typedef GLenum)* errorCallbackType -->
-    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-44'/>
-    <!-- typedef surfEvalMachine surfEvalMachine -->
-    <typedef-decl name='surfEvalMachine' type-id='type-id-93' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-54'/>
-    <!-- BasicCurveEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-87'/>
-    <!-- BasicSurfaceEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-88'/>
-    <!-- BasicSurfaceEvaluator* -->
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-90'/>
-    <!-- DisplayList* -->
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-85'/>
-    <!-- JumpBuffer* -->
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-74'/>
-    <!-- NurbsTessellator* -->
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-86'/>
-    <!-- O_curve* -->
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-84'/>
-    <!-- O_curve** -->
-    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
-    <!-- O_nurbscurve** -->
-    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-79'/>
-    <!-- O_nurbssurface** -->
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-81'/>
-    <!-- O_pwlcurve** -->
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
-    <!-- O_surface* -->
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-82'/>
-    <!-- O_trim* -->
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-83'/>
-    <!-- O_trim** -->
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-77'/>
-    <!-- StoredVertex* -->
-    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-67'/>
-    <!-- class Maplist -->
-    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <!-- Pool Maplist::mapdescPool -->
-        <var-decl name='mapdescPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+    <!-- class NurbsTessellator -->
+    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
+      <data-member access='protected' layout-offset-in-bits='64'>
+        <!-- Renderhints NurbsTessellator::renderhints -->
+        <var-decl name='renderhints' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='2496'>
-        <!-- Mapdesc* Maplist::maps -->
-        <var-decl name='maps' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
+      <data-member access='protected' layout-offset-in-bits='320'>
+        <!-- Maplist NurbsTessellator::maplist -->
+        <var-decl name='maplist' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='2560'>
-        <!-- Mapdesc** Maplist::lastmap -->
-        <var-decl name='lastmap' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+      <data-member access='protected' layout-offset-in-bits='3008'>
+        <!-- Backend NurbsTessellator::backend -->
+        <var-decl name='backend' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='2624'>
-        <!-- Backend& Maplist::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+      <data-member access='private' layout-offset-in-bits='3648'>
+        <!-- Subdivider NurbsTessellator::subdivider -->
+        <var-decl name='subdivider' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
       </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- Maplist::Maplist(Backend&) -->
-        <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Maplist*' -->
-          <parameter type-id='type-id-106' is-artificial='yes'/>
-          <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- class Pool -->
-    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-75'>
-      <member-type access='protected'>
-        <!-- enum Pool::Magic -->
-        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-108'>
-          <underlying-type type-id='type-id-9'/>
-          <enumerator name='is_allocated' value='62369'/>
-          <enumerator name='is_free' value='61858'/>
-        </enum-decl>
-      </member-type>
-      <data-member access='protected' layout-offset-in-bits='0'>
-        <!-- Buffer* Pool::freelist -->
-        <var-decl name='freelist' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
+      <data-member access='private' layout-offset-in-bits='24064'>
+        <!-- JumpBuffer* NurbsTessellator::jumpbuffer -->
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='24128'>
+        <!-- Pool NurbsTessellator::o_pwlcurvePool -->
+        <var-decl name='o_pwlcurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='26624'>
+        <!-- Pool NurbsTessellator::o_nurbscurvePool -->
+        <var-decl name='o_nurbscurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='29120'>
+        <!-- Pool NurbsTessellator::o_curvePool -->
+        <var-decl name='o_curvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='31616'>
+        <!-- Pool NurbsTessellator::o_trimPool -->
+        <var-decl name='o_trimPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='34112'>
+        <!-- Pool NurbsTessellator::o_surfacePool -->
+        <var-decl name='o_surfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='36608'>
+        <!-- Pool NurbsTessellator::o_nurbssurfacePool -->
+        <var-decl name='o_nurbssurfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='39104'>
+        <!-- Pool NurbsTessellator::propertyPool -->
+        <var-decl name='propertyPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='41600'>
+        <!-- Pool NurbsTessellator::quiltPool -->
+        <var-decl name='quiltPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='44096'>
+        <!-- TrimVertexPool NurbsTessellator::extTrimVertexPool -->
+        <var-decl name='extTrimVertexPool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46720'>
+        <!-- int NurbsTessellator::inSurface -->
+        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46752'>
+        <!-- int NurbsTessellator::inCurve -->
+        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46784'>
+        <!-- int NurbsTessellator::inTrim -->
+        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46816'>
+        <!-- int NurbsTessellator::isCurveModified -->
+        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46848'>
+        <!-- int NurbsTessellator::isTrimModified -->
+        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46880'>
+        <!-- int NurbsTessellator::isSurfaceModified -->
+        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46912'>
+        <!-- int NurbsTessellator::isDataValid -->
+        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46944'>
+        <!-- int NurbsTessellator::numTrims -->
+        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='46976'>
+        <!-- int NurbsTessellator::playBack -->
+        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47040'>
+        <!-- O_trim** NurbsTessellator::nextTrim -->
+        <var-decl name='nextTrim' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47104'>
+        <!-- O_curve** NurbsTessellator::nextCurve -->
+        <var-decl name='nextCurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47168'>
+        <!-- O_nurbscurve** NurbsTessellator::nextNurbscurve -->
+        <var-decl name='nextNurbscurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47232'>
+        <!-- O_pwlcurve** NurbsTessellator::nextPwlcurve -->
+        <var-decl name='nextPwlcurve' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47296'>
+        <!-- O_nurbssurface** NurbsTessellator::nextNurbssurface -->
+        <var-decl name='nextNurbssurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47360'>
+        <!-- O_surface* NurbsTessellator::currentSurface -->
+        <var-decl name='currentSurface' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47424'>
+        <!-- O_trim* NurbsTessellator::currentTrim -->
+        <var-decl name='currentTrim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47488'>
+        <!-- O_curve* NurbsTessellator::currentCurve -->
+        <var-decl name='currentCurve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='47552'>
+        <!-- DisplayList* NurbsTessellator::dl -->
+        <var-decl name='dl' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <!-- NurbsTessellator::NurbsTessellator(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
+        <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- parameter of type 'BasicCurveEvaluator&' -->
+          <parameter type-id='type-id-88'/>
+          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
+          <parameter type-id='type-id-89'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <!-- NurbsTessellator::~NurbsTessellator(int) -->
+        <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <!-- void NurbsTessellator::bgnrender() -->
+        <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <!-- void NurbsTessellator::endrender() -->
+        <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <!-- void NurbsTessellator::makeobj(int) -->
+        <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <!-- void NurbsTessellator::closeobj() -->
+        <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <!-- void NurbsTessellator::errorHandler(int) -->
+        <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'NurbsTessellator*' -->
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- const GLint* -->
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-62'/>
+    <!-- typedef unsigned char GLboolean -->
+    <typedef-decl name='GLboolean' type-id='type-id-91' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-45'/>
+    <!-- typedef unsigned int GLenum -->
+    <typedef-decl name='GLenum' type-id='type-id-92' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-59'/>
+    <!-- typedef int GLint -->
+    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-63'/>
+    <!-- typedef void ()* _GLUfuncptr -->
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-60'/>
+    <!-- typedef void (typedef GLenum)* errorCallbackType -->
+    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-44'/>
+    <!-- typedef surfEvalMachine surfEvalMachine -->
+    <typedef-decl name='surfEvalMachine' type-id='type-id-93' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-54'/>
+    <!-- BasicCurveEvaluator& -->
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-88'/>
+    <!-- BasicSurfaceEvaluator& -->
+    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-89'/>
+    <!-- BasicSurfaceEvaluator* -->
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-70'/>
+    <!-- DisplayList* -->
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-86'/>
+    <!-- JumpBuffer* -->
+    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-75'/>
+    <!-- NurbsTessellator* -->
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-87'/>
+    <!-- O_curve* -->
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-85'/>
+    <!-- O_curve** -->
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-79'/>
+    <!-- O_nurbscurve** -->
+    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-80'/>
+    <!-- O_nurbssurface** -->
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-82'/>
+    <!-- O_pwlcurve** -->
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-81'/>
+    <!-- O_surface* -->
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-83'/>
+    <!-- O_trim* -->
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-84'/>
+    <!-- O_trim** -->
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
+    <!-- StoredVertex* -->
+    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-67'/>
+    <!-- struct Backend -->
+    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-73'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <!-- BasicCurveEvaluator& Backend::curveEvaluator -->
+        <var-decl name='curveEvaluator' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='64'>
+        <!-- BasicSurfaceEvaluator& Backend::surfaceEvaluator -->
+        <var-decl name='surfaceEvaluator' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='128'>
+        <!-- int Backend::wireframetris -->
+        <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='160'>
+        <!-- int Backend::wireframequads -->
+        <var-decl name='wireframequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='192'>
+        <!-- int Backend::npts -->
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='224'>
+        <!-- REAL Backend::mesh[3][4] -->
+        <var-decl name='mesh' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='608'>
+        <!-- int Backend::meshindex -->
+        <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <!-- Backend::Backend(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
+        <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Backend*' -->
+          <parameter type-id='type-id-106' is-artificial='yes'/>
+          <!-- parameter of type 'BasicCurveEvaluator&' -->
+          <parameter type-id='type-id-88'/>
+          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
+          <parameter type-id='type-id-89'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- class Maplist -->
+    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-72'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <!-- Pool Maplist::mapdescPool -->
+        <var-decl name='mapdescPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2496'>
+        <!-- Mapdesc* Maplist::maps -->
+        <var-decl name='maps' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2560'>
+        <!-- Mapdesc** Maplist::lastmap -->
+        <var-decl name='lastmap' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2624'>
+        <!-- Backend& Maplist::backend -->
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <!-- Maplist::Maplist(Backend&) -->
+        <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Maplist*' -->
+          <parameter type-id='type-id-110' is-artificial='yes'/>
+          <!-- parameter of type 'Backend&' -->
+          <parameter type-id='type-id-111'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- class Pool -->
+    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-76'>
+      <member-type access='protected'>
+        <!-- enum Pool::Magic -->
+        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-112'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='is_allocated' value='62369'/>
+          <enumerator name='is_free' value='61858'/>
+        </enum-decl>
+      </member-type>
+      <data-member access='protected' layout-offset-in-bits='0'>
+        <!-- Buffer* Pool::freelist -->
+        <var-decl name='freelist' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
         <!-- char* Pool::blocklist[32] -->
-        <var-decl name='blocklist' type-id='type-id-110' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
+        <var-decl name='blocklist' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <!-- int Pool::nextblock -->
@@ -2458,7 +2502,7 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <!-- char* Pool::curblock -->
-        <var-decl name='curblock' type-id='type-id-111' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
+        <var-decl name='curblock' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <!-- int Pool::buffersize -->
@@ -2478,23 +2522,23 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <!-- const char* Pool::name -->
-        <var-decl name='name' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
+        <var-decl name='name' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2432'>
         <!-- Pool::Magic Pool::magic -->
-        <var-decl name='magic' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
+        <var-decl name='magic' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Pool::Pool(int, int, const char*) -->
         <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Pool*' -->
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-112'/>
+          <parameter type-id='type-id-116'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2503,7 +2547,7 @@
         <!-- Pool::~Pool(int) -->
         <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Pool*' -->
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -2511,11 +2555,55 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <!-- struct Renderhints -->
+    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-71'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- REAL Renderhints::display_method -->
+        <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <!-- REAL Renderhints::errorchecking -->
+        <var-decl name='errorchecking' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- REAL Renderhints::subdivisions -->
+        <var-decl name='subdivisions' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <!-- REAL Renderhints::tmp1 -->
+        <var-decl name='tmp1' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- int Renderhints::displaydomain -->
+        <var-decl name='displaydomain' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <!-- int Renderhints::maxsubdivisions -->
+        <var-decl name='maxsubdivisions' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- int Renderhints::wiretris -->
+        <var-decl name='wiretris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='224'>
+        <!-- int Renderhints::wirequads -->
+        <var-decl name='wirequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <!-- Renderhints::Renderhints() -->
+        <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Renderhints*' -->
+          <parameter type-id='type-id-118' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- class Subdivider -->
-    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-73'>
+    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-74'>
       <member-type access='private'>
         <!-- enum Subdivider::dir -->
-        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-114'>
+        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-119'>
           <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
@@ -2525,47 +2613,47 @@
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Slicer Subdivider::slicer -->
-        <var-decl name='slicer' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
+        <var-decl name='slicer' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8064'>
         <!-- ArcTessellator Subdivider::arctessellator -->
-        <var-decl name='arctessellator' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
+        <var-decl name='arctessellator' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8192'>
         <!-- Pool Subdivider::arcpool -->
-        <var-decl name='arcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+        <var-decl name='arcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='10688'>
         <!-- Pool Subdivider::bezierarcpool -->
-        <var-decl name='bezierarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+        <var-decl name='bezierarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13184'>
         <!-- Pool Subdivider::pwlarcpool -->
-        <var-decl name='pwlarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+        <var-decl name='pwlarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='15680'>
         <!-- TrimVertexPool Subdivider::trimvertexpool -->
-        <var-decl name='trimvertexpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+        <var-decl name='trimvertexpool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18304'>
         <!-- JumpBuffer* Subdivider::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18368'>
         <!-- Renderhints& Subdivider::renderhints -->
-        <var-decl name='renderhints' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18432'>
         <!-- Backend& Subdivider::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18496'>
         <!-- Bin Subdivider::initialbin -->
-        <var-decl name='initialbin' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
+        <var-decl name='initialbin' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18624'>
         <!-- Arc_ptr Subdivider::pjarc -->
-        <var-decl name='pjarc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
+        <var-decl name='pjarc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <!-- int Subdivider::s_index -->
@@ -2577,27 +2665,27 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <!-- Quilt* Subdivider::qlist -->
-        <var-decl name='qlist' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
+        <var-decl name='qlist' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18816'>
         <!-- Flist Subdivider::spbrkpts -->
-        <var-decl name='spbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
+        <var-decl name='spbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19136'>
         <!-- Flist Subdivider::tpbrkpts -->
-        <var-decl name='tpbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
+        <var-decl name='tpbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19456'>
         <!-- Flist Subdivider::smbrkpts -->
-        <var-decl name='smbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
+        <var-decl name='smbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19776'>
         <!-- Flist Subdivider::tmbrkpts -->
-        <var-decl name='tmbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
+        <var-decl name='tmbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20096'>
         <!-- REAL Subdivider::stepsizes[4] -->
-        <var-decl name='stepsizes' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
+        <var-decl name='stepsizes' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <!-- int Subdivider::showDegenerate -->
@@ -2623,11 +2711,11 @@
         <!-- Subdivider::Subdivider(Renderhints&, Backend&) -->
         <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Subdivider*' -->
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- parameter of type 'Renderhints&' -->
-          <parameter type-id='type-id-124'/>
+          <parameter type-id='type-id-129'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -2636,7 +2724,7 @@
         <!-- Subdivider::~Subdivider(int) -->
         <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Subdivider*' -->
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -2644,101 +2732,11 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- const GLint -->
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-89'/>
-    <!-- struct Backend -->
-    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-72'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <!-- BasicCurveEvaluator& Backend::curveEvaluator -->
-        <var-decl name='curveEvaluator' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='64'>
-        <!-- BasicSurfaceEvaluator& Backend::surfaceEvaluator -->
-        <var-decl name='surfaceEvaluator' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='128'>
-        <!-- int Backend::wireframetris -->
-        <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='160'>
-        <!-- int Backend::wireframequads -->
-        <var-decl name='wireframequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='106' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='192'>
-        <!-- int Backend::npts -->
-        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='224'>
-        <!-- REAL Backend::mesh[3][4] -->
-        <var-decl name='mesh' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='608'>
-        <!-- int Backend::meshindex -->
-        <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
-      </data-member>
-      <member-function access='public' constructor='yes'>
-        <!-- Backend::Backend(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
-        <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Backend*' -->
-          <parameter type-id='type-id-128' is-artificial='yes'/>
-          <!-- parameter of type 'BasicCurveEvaluator&' -->
-          <parameter type-id='type-id-87'/>
-          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
-          <parameter type-id='type-id-88'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- struct Renderhints -->
-    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-70'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- REAL Renderhints::display_method -->
-        <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <!-- REAL Renderhints::errorchecking -->
-        <var-decl name='errorchecking' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='50' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- REAL Renderhints::subdivisions -->
-        <var-decl name='subdivisions' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='51' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <!-- REAL Renderhints::tmp1 -->
-        <var-decl name='tmp1' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='52' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- int Renderhints::displaydomain -->
-        <var-decl name='displaydomain' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='54' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <!-- int Renderhints::maxsubdivisions -->
-        <var-decl name='maxsubdivisions' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='55' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- int Renderhints::wiretris -->
-        <var-decl name='wiretris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <!-- int Renderhints::wirequads -->
-        <var-decl name='wirequads' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/renderhints.h' line='57' column='1'/>
-      </data-member>
-      <member-function access='public' constructor='yes'>
-        <!-- Renderhints::Renderhints() -->
-        <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Renderhints*' -->
-          <parameter type-id='type-id-129' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
     <!-- struct TrimVertexPool -->
-    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-76'>
+    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-77'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool TrimVertexPool::pool -->
-        <var-decl name='pool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='pool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- TrimVertex** TrimVertexPool::vlist -->
@@ -2915,30 +2913,32 @@
         <var-decl name='vcoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='79' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const GLint -->
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-90'/>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-91'/>
     <!-- unsigned int -->
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-92'/>
     <!-- Backend& -->
-    <qualified-type-def type-id='type-id-107' id='type-id-105'/>
+    <qualified-type-def type-id='type-id-111' id='type-id-109'/>
     <!-- Backend& -->
-    <reference-type-def kind='lvalue' type-id='type-id-72' size-in-bits='64' id='type-id-107'/>
+    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-111'/>
     <!-- Backend* -->
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-106'/>
     <!-- BasicCurveEvaluator& -->
-    <qualified-type-def type-id='type-id-87' id='type-id-125'/>
+    <qualified-type-def type-id='type-id-88' id='type-id-103'/>
     <!-- BasicSurfaceEvaluator& -->
-    <qualified-type-def type-id='type-id-88' id='type-id-126'/>
+    <qualified-type-def type-id='type-id-89' id='type-id-104'/>
     <!-- Buffer* -->
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-113'/>
     <!-- GLenum* -->
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-134'/>
     <!-- Mapdesc* -->
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-107'/>
     <!-- Mapdesc** -->
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
     <!-- Maplist* -->
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-110'/>
     <!-- O_nurbscurve* -->
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-97'/>
     <!-- O_nurbssurface* -->
@@ -2946,44 +2946,44 @@
     <!-- O_pwlcurve* -->
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-99'/>
     <!-- Pool* -->
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-117'/>
     <!-- Quilt* -->
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-120'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-125'/>
     <!-- REAL[3][4] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
+    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-105'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
     <!-- REAL[4] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-127'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
     <!-- Renderhints& -->
-    <qualified-type-def type-id='type-id-124' id='type-id-117'/>
+    <qualified-type-def type-id='type-id-129' id='type-id-122'/>
     <!-- Renderhints& -->
-    <reference-type-def kind='lvalue' type-id='type-id-70' size-in-bits='64' id='type-id-124'/>
+    <reference-type-def kind='lvalue' type-id='type-id-71' size-in-bits='64' id='type-id-129'/>
     <!-- Renderhints* -->
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-118'/>
     <!-- Subdivider* -->
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-123'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-128'/>
     <!-- TrimVertex** -->
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-130'/>
     <!-- TrimVertexPool* -->
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-131'/>
     <!-- bezierPatch* -->
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-132'/>
     <!-- char* -->
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-115'/>
     <!-- char*[32] -->
-    <array-type-def dimensions='1' type-id='type-id-111' size-in-bits='2048' id='type-id-110'>
+    <array-type-def dimensions='1' type-id='type-id-115' size-in-bits='2048' id='type-id-114'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
     <!-- class ArcTessellator -->
-    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-116'>
+    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-121'>
       <data-member access='private' static='yes'>
         <!-- static REAL ArcTessellator::gl_Bernstein[][24][24] -->
         <var-decl name='gl_Bernstein' type-id='type-id-145' mangled-name='_ZN14ArcTessellator12gl_BernsteinE' visibility='default' filepath='libnurbs/internals/arctess.h' line='60' column='1'/>
@@ -3022,14 +3022,14 @@
       </member-function>
     </class-decl>
     <!-- class Bin -->
-    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-118'>
+    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-123'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Arc_ptr Bin::head -->
-        <var-decl name='head' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
+        <var-decl name='head' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Arc_ptr Bin::current -->
-        <var-decl name='current' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
+        <var-decl name='current' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Bin::Bin() -->
@@ -3060,7 +3060,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Pool DisplayList::dlnodePool -->
-        <var-decl name='dlnodePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
+        <var-decl name='dlnodePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- Dlnode** DisplayList::lastNode -->
@@ -3068,15 +3068,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
         <!-- NurbsTessellator* DisplayList::nt -->
-        <var-decl name='nt' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
+        <var-decl name='nt' type-id='type-id-87' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- DisplayList::DisplayList(NurbsTessellator*) -->
         <function-decl name='DisplayList' filepath='libnurbs/internals/displaylist.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DisplayList*' -->
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3085,7 +3085,7 @@
         <!-- DisplayList::~DisplayList(int) -->
         <function-decl name='~DisplayList' filepath='libnurbs/internals/displaylist.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DisplayList*' -->
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -3094,139 +3094,41 @@
       </member-function>
     </class-decl>
     <!-- class Flist -->
-    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-121'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <!-- REAL* Flist::pts -->
-        <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='64'>
-        <!-- int Flist::npts -->
-        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='96'>
-        <!-- int Flist::start -->
-        <var-decl name='start' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='128'>
-        <!-- int Flist::end -->
-        <var-decl name='end' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='192'>
-        <!-- FlistSorter Flist::sorter -->
-        <var-decl name='sorter' type-id='type-id-154' visibility='default' filepath='libnurbs/internals/flist.h' line='56' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- Flist::Flist() -->
-        <function-decl name='Flist' filepath='libnurbs/internals/flist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Flist*' -->
-          <parameter type-id='type-id-155' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <!-- Flist::~Flist(int) -->
-        <function-decl name='~Flist' filepath='libnurbs/internals/flist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Flist*' -->
-          <parameter type-id='type-id-155' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- class Slicer -->
-    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-115'>
-      <!-- class CoveAndTiler -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
-      <!-- class Mesher -->
-      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-157'/>
-      <data-member access='private' layout-offset-in-bits='5248'>
-        <!-- Backend& Slicer::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5312'>
-        <!-- REAL Slicer::oneOverDu -->
-        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5344'>
-        <!-- REAL Slicer::du -->
-        <var-decl name='du' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5376'>
-        <!-- REAL Slicer::dv -->
-        <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5408'>
-        <!-- int Slicer::isolines -->
-        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5440'>
-        <!-- int Slicer::ulinear -->
-        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5472'>
-        <!-- int Slicer::vlinear -->
-        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- Slicer::Slicer(int, void**, Backend&) -->
-        <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Slicer*' -->
-          <parameter type-id='type-id-158' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <!-- Slicer::~Slicer(int, void**) -->
-        <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Slicer*' -->
-          <parameter type-id='type-id-158' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- class StoredVertex -->
-    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-102'>
+    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-126'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <!-- int StoredVertex::type -->
-        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+        <!-- REAL* Flist::pts -->
+        <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='32'>
-        <!-- REAL StoredVertex::coord[2] -->
-        <var-decl name='coord' type-id='type-id-160' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+      <data-member access='private' layout-offset-in-bits='64'>
+        <!-- int Flist::npts -->
+        <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='45' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='96'>
+        <!-- int Flist::start -->
+        <var-decl name='start' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <!-- long int StoredVertex::point[2] -->
-        <var-decl name='point' type-id='type-id-161' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+        <!-- int Flist::end -->
+        <var-decl name='end' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/flist.h' line='47' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='192'>
+        <!-- FlistSorter Flist::sorter -->
+        <var-decl name='sorter' type-id='type-id-154' visibility='default' filepath='libnurbs/internals/flist.h' line='56' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
-        <!-- StoredVertex::StoredVertex() -->
-        <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'StoredVertex*' -->
-          <parameter type-id='type-id-67' is-artificial='yes'/>
+        <!-- Flist::Flist() -->
+        <function-decl name='Flist' filepath='libnurbs/internals/flist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Flist*' -->
+          <parameter type-id='type-id-155' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
-        <!-- StoredVertex::~StoredVertex(int) -->
-        <function-decl name='~StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'StoredVertex*' -->
-          <parameter type-id='type-id-67' is-artificial='yes'/>
+        <!-- Flist::~Flist(int) -->
+        <function-decl name='~Flist' filepath='libnurbs/internals/flist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Flist*' -->
+          <parameter type-id='type-id-155' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -3234,24 +3136,20 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- const char* -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-112'/>
-    <!-- int* -->
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-133'/>
     <!-- struct JumpBuffer -->
     <class-decl name='JumpBuffer' size-in-bits='1600' is-struct='yes' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='56' column='1' id='type-id-95'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- jmp_buf JumpBuffer::buf -->
-        <var-decl name='buf' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
+        <var-decl name='buf' type-id='type-id-156' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct O_curve -->
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-96'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
         <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-165'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
           <data-member access='private'>
             <!-- O_nurbscurve* o_nurbscurve -->
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
@@ -3264,19 +3162,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} O_curve::curve -->
-        <var-decl name='curve' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
+        <var-decl name='curve' type-id='type-id-158' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Curvetype O_curve::curvetype -->
-        <var-decl name='curvetype' type-id='type-id-166' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
+        <var-decl name='curvetype' type-id='type-id-159' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_curve* O_curve::next -->
-        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
+        <var-decl name='next' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_surface* O_curve::owner -->
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_curve::used -->
@@ -3294,7 +3192,7 @@
         <!-- O_curve::O_curve() -->
         <function-decl name='O_curve' filepath='libnurbs/internals/reader.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_curve*' -->
-          <parameter type-id='type-id-84' is-artificial='yes'/>
+          <parameter type-id='type-id-85' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3303,14 +3201,14 @@
     <!-- struct O_surface -->
     <class-decl name='O_surface' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='112' column='1' id='type-id-100'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- O_nurbssurface* O_surface::o_nurbssurface -->
         <var-decl name='o_nurbssurface' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_surface::o_trim -->
-        <var-decl name='o_trim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
+        <var-decl name='o_trim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_surface::save -->
@@ -3324,7 +3222,7 @@
         <!-- O_surface::O_surface() -->
         <function-decl name='O_surface' filepath='libnurbs/internals/reader.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_surface*' -->
-          <parameter type-id='type-id-82' is-artificial='yes'/>
+          <parameter type-id='type-id-83' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3333,14 +3231,14 @@
     <!-- struct O_trim -->
     <class-decl name='O_trim' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='94' column='1' id='type-id-101'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- O_curve* O_trim::o_curve -->
-        <var-decl name='o_curve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
+        <var-decl name='o_curve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_trim::next -->
-        <var-decl name='next' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
+        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_trim::save -->
@@ -3350,32 +3248,134 @@
         <!-- O_trim::O_trim() -->
         <function-decl name='O_trim' filepath='libnurbs/internals/reader.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_trim*' -->
-          <parameter type-id='type-id-83' is-artificial='yes'/>
+          <parameter type-id='type-id-84' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- class Slicer -->
+    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-120'>
+      <!-- class CoveAndTiler -->
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
+      <!-- class Mesher -->
+      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-161'/>
+      <data-member access='private' layout-offset-in-bits='5248'>
+        <!-- Backend& Slicer::backend -->
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5312'>
+        <!-- REAL Slicer::oneOverDu -->
+        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5344'>
+        <!-- REAL Slicer::du -->
+        <var-decl name='du' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5376'>
+        <!-- REAL Slicer::dv -->
+        <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5408'>
+        <!-- int Slicer::isolines -->
+        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5440'>
+        <!-- int Slicer::ulinear -->
+        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5472'>
+        <!-- int Slicer::vlinear -->
+        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <!-- Slicer::Slicer(int, void**, Backend&) -->
+        <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Slicer*' -->
+          <parameter type-id='type-id-162' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- artificial parameter of type 'void**' -->
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <!-- parameter of type 'Backend&' -->
+          <parameter type-id='type-id-111'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <!-- Slicer::~Slicer(int, void**) -->
+        <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Slicer*' -->
+          <parameter type-id='type-id-162' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- artificial parameter of type 'void**' -->
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- class StoredVertex -->
+    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-102'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <!-- int StoredVertex::type -->
+        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='32'>
+        <!-- REAL StoredVertex::coord[2] -->
+        <var-decl name='coord' type-id='type-id-164' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='128'>
+        <!-- long int StoredVertex::point[2] -->
+        <var-decl name='point' type-id='type-id-165' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <!-- StoredVertex::StoredVertex() -->
+        <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'StoredVertex*' -->
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <!-- StoredVertex::~StoredVertex(int) -->
+        <function-decl name='~StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'StoredVertex*' -->
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
+    <!-- const char* -->
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-116'/>
+    <!-- int* -->
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-133'/>
     <!-- typedef Arc* Arc_ptr -->
-    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-119'/>
+    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-124'/>
     <!-- Arc* -->
     <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-167'/>
     <!-- ArcTessellator* -->
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-148'/>
     <!-- Bin* -->
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-151'/>
     <!-- Dlnode* -->
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-152'/>
     <!-- Dlnode** -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
     <!-- Flist* -->
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-155'/>
     <!-- Pool& -->
     <qualified-type-def type-id='type-id-150' id='type-id-146'/>
     <!-- Pool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-75' size-in-bits='64' id='type-id-150'/>
+    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-150'/>
     <!-- REAL[2] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-160'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-164'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
@@ -3389,29 +3389,29 @@
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
     <!-- Slicer* -->
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-162'/>
     <!-- TrimVertex* -->
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-141'/>
     <!-- TrimVertexPool& -->
     <qualified-type-def type-id='type-id-149' id='type-id-147'/>
     <!-- TrimVertexPool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-149'/>
+    <reference-type-def kind='lvalue' type-id='type-id-77' size-in-bits='64' id='type-id-149'/>
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-143'/>
     <!-- class Buffer -->
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-135'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Buffer* Buffer::next -->
-        <var-decl name='next' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
+        <var-decl name='next' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
       </data-member>
     </class-decl>
     <!-- class CoveAndTiler -->
-    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-156'>
+    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-160'>
       <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Backend& CoveAndTiler::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static const int CoveAndTiler::MAXSTRIPSIZE -->
@@ -3425,9 +3425,9 @@
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3440,7 +3440,7 @@
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3476,9 +3476,9 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -3489,9 +3489,9 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3502,103 +3502,20 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- class Mesher -->
-    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-157'>
-      <!-- class TrimRegion -->
-      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
-      <!-- class Hull -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
-      <data-member access='private' static='yes'>
-        <!-- static const float Mesher::ZERO -->
-        <var-decl name='ZERO' type-id='type-id-179' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2240'>
-        <!-- Backend& Mesher::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2304'>
-        <!-- Pool Mesher::p -->
-        <var-decl name='p' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4800'>
-        <!-- unsigned int Mesher::stacksize -->
-        <var-decl name='stacksize' type-id='type-id-92' visibility='default' filepath='libnurbs/internals/mesher.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4864'>
-        <!-- GridTrimVertex** Mesher::vdata -->
-        <var-decl name='vdata' type-id='type-id-180' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4928'>
-        <!-- GridTrimVertex* Mesher::last[2] -->
-        <var-decl name='last' type-id='type-id-181' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5056'>
-        <!-- int Mesher::itop -->
-        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5088'>
-        <!-- int Mesher::lastedge -->
-        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- Mesher::Mesher(int, void**, Backend&) -->
-        <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Mesher*' -->
-          <parameter type-id='type-id-182' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <!-- Mesher::~Mesher(int, void**) -->
-        <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Mesher*' -->
-          <parameter type-id='type-id-182' is-artificial='yes'/>
-          <!-- artificial parameter of type 'int' -->
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- class PooledObj -->
-    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-164'/>
-    <!-- const char -->
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-162'/>
-    <!-- enum Curvetype -->
-    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-166'>
-      <underlying-type type-id='type-id-9'/>
-      <enumerator name='ct_nurbscurve' value='0'/>
-      <enumerator name='ct_pwlcurve' value='1'/>
-      <enumerator name='ct_none' value='2'/>
-    </enum-decl>
-    <!-- long int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-161'>
-      <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
-    </array-type-def>
     <!-- struct Mapdesc -->
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-136'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Mapdesc::pixel_tolerance -->
         <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
@@ -3633,7 +3550,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- REAL Mapdesc::bboxsize[5] -->
-        <var-decl name='bboxsize' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
+        <var-decl name='bboxsize' type-id='type-id-178' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
@@ -3661,15 +3578,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
-        <var-decl name='bmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
+        <var-decl name='bmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
         <!-- Maxmatrix Mapdesc::cmat -->
-        <var-decl name='cmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
+        <var-decl name='cmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2272'>
         <!-- Maxmatrix Mapdesc::smat -->
-        <var-decl name='smat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
+        <var-decl name='smat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <!-- REAL Mapdesc::s_steps -->
@@ -3693,25 +3610,92 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
         <!-- Mapdesc* Mapdesc::next -->
-        <var-decl name='next' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
+        <var-decl name='next' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='3328'>
+        <!-- Backend& Mapdesc::backend -->
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <!-- Mapdesc::Mapdesc(long int, int, int, Backend&) -->
+        <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Mapdesc*' -->
+          <parameter type-id='type-id-107' is-artificial='yes'/>
+          <!-- parameter of type 'long int' -->
+          <parameter type-id='type-id-15'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- parameter of type 'int' -->
+          <parameter type-id='type-id-11'/>
+          <!-- parameter of type 'Backend&' -->
+          <parameter type-id='type-id-111'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- class Mesher -->
+    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-161'>
+      <!-- class TrimRegion -->
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
+      <!-- class Hull -->
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
+      <data-member access='private' static='yes'>
+        <!-- static const float Mesher::ZERO -->
+        <var-decl name='ZERO' type-id='type-id-181' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2240'>
+        <!-- Backend& Mesher::backend -->
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2304'>
+        <!-- Pool Mesher::p -->
+        <var-decl name='p' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4800'>
+        <!-- unsigned int Mesher::stacksize -->
+        <var-decl name='stacksize' type-id='type-id-92' visibility='default' filepath='libnurbs/internals/mesher.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4864'>
+        <!-- GridTrimVertex** Mesher::vdata -->
+        <var-decl name='vdata' type-id='type-id-182' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4928'>
+        <!-- GridTrimVertex* Mesher::last[2] -->
+        <var-decl name='last' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5056'>
+        <!-- int Mesher::itop -->
+        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='3328'>
-        <!-- Backend& Mapdesc::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
+      <data-member access='private' layout-offset-in-bits='5088'>
+        <!-- int Mesher::lastedge -->
+        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
       </data-member>
-      <member-function access='public' constructor='yes'>
-        <!-- Mapdesc::Mapdesc(long int, int, int, Backend&) -->
-        <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Mapdesc*' -->
-          <parameter type-id='type-id-103' is-artificial='yes'/>
-          <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-15'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-11'/>
-          <!-- parameter of type 'int' -->
-          <parameter type-id='type-id-11'/>
+      <member-function access='private' constructor='yes'>
+        <!-- Mesher::Mesher(int, void**, Backend&) -->
+        <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Mesher*' -->
+          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- artificial parameter of type 'void**' -->
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <!-- Mesher::~Mesher(int, void**) -->
+        <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Mesher*' -->
+          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <!-- artificial parameter of type 'int' -->
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <!-- artificial parameter of type 'void**' -->
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3720,10 +3704,10 @@
     <!-- struct O_nurbscurve -->
     <class-decl name='O_nurbscurve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='70' column='1' id='type-id-137'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Quilt* O_nurbscurve::bezier_curves -->
-        <var-decl name='bezier_curves' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
+        <var-decl name='bezier_curves' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbscurve::type -->
@@ -3751,7 +3735,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- O_curve* O_nurbscurve::owner -->
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_nurbscurve::O_nurbscurve(long int) -->
@@ -3768,10 +3752,10 @@
     <!-- struct O_nurbssurface -->
     <class-decl name='O_nurbssurface' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='101' column='1' id='type-id-138'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Quilt* O_nurbssurface::bezier_patches -->
-        <var-decl name='bezier_patches' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
+        <var-decl name='bezier_patches' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbssurface::type -->
@@ -3779,7 +3763,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_surface* O_nurbssurface::owner -->
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbssurface* O_nurbssurface::next -->
@@ -3808,7 +3792,7 @@
     <!-- struct O_pwlcurve -->
     <class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- TrimVertex* O_pwlcurve::pts -->
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/reader.h' line='85' column='1'/>
@@ -3831,7 +3815,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- O_curve* O_pwlcurve::owner -->
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_pwlcurve::O_pwlcurve(long int, long int, float*, long int, TrimVertex*) -->
@@ -3853,13 +3837,15 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <!-- class PooledObj -->
+    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-157'/>
     <!-- struct Quilt -->
     <class-decl name='Quilt' size-in-bits='896' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='64' column='1' id='type-id-140'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Mapdesc* Quilt::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
@@ -3875,15 +3861,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- Quilt* Quilt::next -->
-        <var-decl name='next' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Quilt::Quilt(Mapdesc*) -->
         <function-decl name='Quilt' filepath='libnurbs/internals/quilt.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120' is-artificial='yes'/>
+          <parameter type-id='type-id-125' is-artificial='yes'/>
           <!-- parameter of type 'Mapdesc*' -->
-          <parameter type-id='type-id-103'/>
+          <parameter type-id='type-id-107'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3928,30 +3914,44 @@
         <var-decl name='next' type-id='type-id-132' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='63' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const char -->
+    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-166'/>
+    <!-- enum Curvetype -->
+    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-159'>
+      <underlying-type type-id='type-id-9'/>
+      <enumerator name='ct_nurbscurve' value='0'/>
+      <enumerator name='ct_pwlcurve' value='1'/>
+      <enumerator name='ct_none' value='2'/>
+    </enum-decl>
+    <!-- long int[2] -->
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-165'>
+      <!-- <anonymous range>[2] -->
+      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
+    </array-type-def>
     <!-- typedef __jmp_buf_tag[1] jmp_buf -->
-    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-163'/>
+    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-156'/>
     <!-- void** -->
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-163'/>
     <!-- CoveAndTiler* -->
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-175'/>
     <!-- FlistSorter* -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-177'/>
     <!-- GridTrimVertex** -->
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-182'/>
     <!-- GridTrimVertex*[2] -->
-    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
+    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-183'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <!-- Mesher* -->
-    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-184'/>
     <!-- Quiltspec[2] -->
     <array-type-def dimensions='1' type-id='type-id-189' size-in-bits='640' id='type-id-185'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <!-- REAL[5] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-183'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-178'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-190'/>
     </array-type-def>
@@ -3960,24 +3960,131 @@
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-3' id='type-id-192'/>
     </array-type-def>
+    <!-- struct Arc -->
+    <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
+      <!-- class PooledObj -->
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
+      <data-member access='public' static='yes'>
+        <!-- static const int Arc::bezier_tag -->
+        <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' static='yes'>
+        <!-- static const int Arc::arc_tag -->
+        <var-decl name='arc_tag' type-id='type-id-174' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' static='yes'>
+        <!-- static const int Arc::tail_tag -->
+        <var-decl name='tail_tag' type-id='type-id-174' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- Arc_ptr Arc::prev -->
+        <var-decl name='prev' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- Arc_ptr Arc::next -->
+        <var-decl name='next' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- Arc_ptr Arc::link -->
+        <var-decl name='link' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- BezierArc* Arc::bezierArc -->
+        <var-decl name='bezierArc' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- PwlArc* Arc::pwlArc -->
+        <var-decl name='pwlArc' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- long int Arc::type -->
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <!-- long int Arc::nuid -->
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <!-- Arc::Arc(Arc*, PwlArc*) -->
+        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Arc*' -->
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <!-- parameter of type 'Arc*' -->
+          <parameter type-id='type-id-167'/>
+          <!-- parameter of type 'PwlArc*' -->
+          <parameter type-id='type-id-194'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <!-- Arc::Arc(arc_side, long int) -->
+        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Arc*' -->
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <!-- parameter of type 'enum arc_side' -->
+          <parameter type-id='type-id-195'/>
+          <!-- parameter of type 'long int' -->
+          <parameter type-id='type-id-15'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <!-- struct Dlnode -->
+    <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
+      <!-- class PooledObj -->
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- PFVS Dlnode::work -->
+        <var-decl name='work' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- void* Dlnode::arg -->
+        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- PFVS Dlnode::cleanup -->
+        <var-decl name='cleanup' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- Dlnode* Dlnode::next -->
+        <var-decl name='next' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='53' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <!-- Dlnode::Dlnode(PFVS, void*, PFVS) -->
+        <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'Dlnode*' -->
+          <parameter type-id='type-id-152' is-artificial='yes'/>
+          <!-- parameter of type 'typedef PFVS' -->
+          <parameter type-id='type-id-196'/>
+          <!-- parameter of type 'void*' -->
+          <parameter type-id='type-id-25'/>
+          <!-- parameter of type 'typedef PFVS' -->
+          <parameter type-id='type-id-196'/>
+          <!-- void -->
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <!-- class Hull -->
-    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
+    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-180'>
       <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <member-type access='private'>
         <!-- struct Hull::Side -->
-        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-193'>
+        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-197'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- Trimline* Hull::Side::left -->
-            <var-decl name='left' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
+            <var-decl name='left' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- Gridline* Hull::Side::line -->
-            <var-decl name='line' type-id='type-id-195' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
+            <var-decl name='line' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- Trimline* Hull::Side::right -->
-            <var-decl name='right' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
+            <var-decl name='right' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- long int Hull::Side::index -->
@@ -3987,29 +4094,29 @@
       </member-type>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Hull::Side Hull::lower -->
-        <var-decl name='lower' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
+        <var-decl name='lower' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- Hull::Side Hull::upper -->
-        <var-decl name='upper' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
+        <var-decl name='upper' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- Trimline Hull::fakeleft -->
-        <var-decl name='fakeleft' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
+        <var-decl name='fakeleft' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <!-- Trimline Hull::fakeright -->
-        <var-decl name='fakeright' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
+        <var-decl name='fakeright' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Hull::Hull(int, void**) -->
         <function-decl name='Hull' filepath='libnurbs/internals/hull.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Hull*' -->
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4018,11 +4125,11 @@
         <!-- Hull::~Hull(int, void**) -->
         <function-decl name='~Hull' filepath='libnurbs/internals/hull.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Hull*' -->
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4038,7 +4145,7 @@
         <!-- Sorter::Sorter(int) -->
         <function-decl name='Sorter' filepath='libnurbs/internals/sorter.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4049,7 +4156,7 @@
         <!-- Sorter::~Sorter(int) -->
         <function-decl name='~Sorter' filepath='libnurbs/internals/sorter.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4060,11 +4167,11 @@
         <!-- int Sorter::qscmp(char*, char*) -->
         <function-decl name='qscmp' mangled-name='_ZN6Sorter5qscmpEPcS0_' filepath='libnurbs/internals/sorter.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -4073,11 +4180,11 @@
         <!-- void Sorter::qsexc(char*, char*) -->
         <function-decl name='qsexc' mangled-name='_ZN6Sorter5qsexcEPcS0_' filepath='libnurbs/internals/sorter.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4086,13 +4193,13 @@
         <!-- void Sorter::qstexc(char*, char*, char*) -->
         <function-decl name='qstexc' mangled-name='_ZN6Sorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/sorter.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4102,144 +4209,33 @@
     <class-decl name='TrimRegion' size-in-bits='2560' visibility='default' filepath='libnurbs/internals/trimregion.h' line='46' column='1' id='type-id-173'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Trimline TrimRegion::left -->
-        <var-decl name='left' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
+        <var-decl name='left' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
         <!-- Trimline TrimRegion::right -->
-        <var-decl name='right' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
+        <var-decl name='right' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
         <!-- Gridline TrimRegion::top -->
-        <var-decl name='top' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
+        <var-decl name='top' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1984'>
         <!-- Gridline TrimRegion::bot -->
-        <var-decl name='bot' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
+        <var-decl name='bot' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
         <!-- Uarray TrimRegion::uarray -->
-        <var-decl name='uarray' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2496'>
-        <!-- REAL TrimRegion::oneOverDu -->
-        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <!-- TrimRegion::TrimRegion() -->
-        <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'TrimRegion*' -->
-          <parameter type-id='type-id-201' is-artificial='yes'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- const float -->
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
-    <!-- const int -->
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
-    <!-- struct Arc -->
-    <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
-      <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
-      <data-member access='public' static='yes'>
-        <!-- static const int Arc::bezier_tag -->
-        <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' static='yes'>
-        <!-- static const int Arc::arc_tag -->
-        <var-decl name='arc_tag' type-id='type-id-174' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='public' static='yes'>
-        <!-- static const int Arc::tail_tag -->
-        <var-decl name='tail_tag' type-id='type-id-174' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- Arc_ptr Arc::prev -->
-        <var-decl name='prev' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- Arc_ptr Arc::next -->
-        <var-decl name='next' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- Arc_ptr Arc::link -->
-        <var-decl name='link' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- BezierArc* Arc::bezierArc -->
-        <var-decl name='bezierArc' type-id='type-id-202' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- PwlArc* Arc::pwlArc -->
-        <var-decl name='pwlArc' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <!-- long int Arc::type -->
-        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <!-- long int Arc::nuid -->
-        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
-      </data-member>
-      <member-function access='public' constructor='yes'>
-        <!-- Arc::Arc(Arc*, PwlArc*) -->
-        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Arc*' -->
-          <parameter type-id='type-id-167' is-artificial='yes'/>
-          <!-- parameter of type 'Arc*' -->
-          <parameter type-id='type-id-167'/>
-          <!-- parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <!-- Arc::Arc(arc_side, long int) -->
-        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Arc*' -->
-          <parameter type-id='type-id-167' is-artificial='yes'/>
-          <!-- parameter of type 'enum arc_side' -->
-          <parameter type-id='type-id-204'/>
-          <!-- parameter of type 'long int' -->
-          <parameter type-id='type-id-15'/>
-          <!-- void -->
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <!-- struct Dlnode -->
-    <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
-      <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- PFVS Dlnode::work -->
-        <var-decl name='work' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void* Dlnode::arg -->
-        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- PFVS Dlnode::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <!-- Dlnode* Dlnode::next -->
-        <var-decl name='next' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='53' column='1'/>
+        <var-decl name='uarray' type-id='type-id-204' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
       </data-member>
-      <member-function access='public' constructor='yes'>
-        <!-- Dlnode::Dlnode(PFVS, void*, PFVS) -->
-        <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- implicit parameter of type 'Dlnode*' -->
-          <parameter type-id='type-id-152' is-artificial='yes'/>
-          <!-- parameter of type 'typedef PFVS' -->
-          <parameter type-id='type-id-205'/>
-          <!-- parameter of type 'void*' -->
-          <parameter type-id='type-id-25'/>
-          <!-- parameter of type 'typedef PFVS' -->
-          <parameter type-id='type-id-205'/>
+      <data-member access='private' layout-offset-in-bits='2496'>
+        <!-- REAL TrimRegion::oneOverDu -->
+        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <!-- TrimRegion::TrimRegion() -->
+        <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <!-- implicit parameter of type 'TrimRegion*' -->
+          <parameter type-id='type-id-205' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4249,27 +4245,31 @@
     <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-172'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL TrimVertex::param[2] -->
-        <var-decl name='param' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+        <var-decl name='param' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
         <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const float -->
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-181'/>
+    <!-- const int -->
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
     <!-- typedef REAL[5][5] Maxmatrix -->
-    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-184'/>
+    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-179'/>
     <!-- typedef Quiltspec* Quiltspec_ptr -->
     <typedef-decl name='Quiltspec_ptr' type-id='type-id-207' filepath='libnurbs/internals/quilt.h' line='62' column='1' id='type-id-186'/>
     <!-- BezierArc* -->
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-193'/>
     <!-- GridTrimVertex* -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-188'/>
     <!-- Gridline* -->
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-199'/>
     <!-- Hull* -->
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-197'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-201'/>
     <!-- PwlArc* -->
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-194'/>
     <!-- Quiltspec* -->
     <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-207'/>
     <!-- REAL[5][5] -->
@@ -4280,13 +4280,71 @@
       <subrange length='5' type-id='type-id-3' id='type-id-190'/>
     </array-type-def>
     <!-- Sorter* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-202'/>
     <!-- TrimRegion* -->
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-205'/>
     <!-- Trimline* -->
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-198'/>
+    <!-- struct Gridline -->
+    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-203'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- long int Gridline::v -->
+        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- REAL Gridline::vval -->
+        <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- long int Gridline::vindex -->
+        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- long int Gridline::ustart -->
+        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- long int Gridline::uend -->
+        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct Quiltspec -->
+    <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-189'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int Quiltspec::stride -->
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <!-- int Quiltspec::width -->
+        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- int Quiltspec::offset -->
+        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <!-- int Quiltspec::order -->
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- int Quiltspec::index -->
+        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <!-- int Quiltspec::bdry[2] -->
+        <var-decl name='bdry' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='224'>
+        <!-- REAL Quiltspec::step_size -->
+        <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- Knot* Quiltspec::breakpoints -->
+        <var-decl name='breakpoints' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
+      </data-member>
+    </class-decl>
     <!-- class Trimline -->
-    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-196'>
+    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-200'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex** Trimline::pts -->
         <var-decl name='pts' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimline.h' line='48' column='1'/>
@@ -4305,7 +4363,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- Jarcloc Trimline::jarcl -->
-        <var-decl name='jarcl' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
+        <var-decl name='jarcl' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- TrimVertex Trimline::t -->
@@ -4327,7 +4385,7 @@
         <!-- Trimline::Trimline() -->
         <function-decl name='Trimline' filepath='libnurbs/internals/trimline.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Trimline*' -->
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4336,7 +4394,7 @@
         <!-- Trimline::~Trimline(int) -->
         <function-decl name='~Trimline' filepath='libnurbs/internals/trimline.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Trimline*' -->
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4345,7 +4403,7 @@
       </member-function>
     </class-decl>
     <!-- class Uarray -->
-    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-200'>
+    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-204'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- long int Uarray::size -->
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
@@ -4362,7 +4420,7 @@
         <!-- Uarray::Uarray() -->
         <function-decl name='Uarray' filepath='libnurbs/internals/uarray.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Uarray*' -->
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4371,7 +4429,7 @@
         <!-- Uarray::~Uarray(int) -->
         <function-decl name='~Uarray' filepath='libnurbs/internals/uarray.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Uarray*' -->
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4379,73 +4437,6 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- enum arc_side -->
-    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-204'>
-      <underlying-type type-id='type-id-9'/>
-      <enumerator name='arc_none' value='0'/>
-      <enumerator name='arc_right' value='1'/>
-      <enumerator name='arc_top' value='2'/>
-      <enumerator name='arc_left' value='3'/>
-      <enumerator name='arc_bottom' value='4'/>
-    </enum-decl>
-    <!-- struct Gridline -->
-    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-199'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- long int Gridline::v -->
-        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- REAL Gridline::vval -->
-        <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- long int Gridline::vindex -->
-        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- long int Gridline::ustart -->
-        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- long int Gridline::uend -->
-        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct Quiltspec -->
-    <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-189'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int Quiltspec::stride -->
-        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <!-- int Quiltspec::width -->
-        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- int Quiltspec::offset -->
-        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <!-- int Quiltspec::order -->
-        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- int Quiltspec::index -->
-        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <!-- int Quiltspec::bdry[2] -->
-        <var-decl name='bdry' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <!-- REAL Quiltspec::step_size -->
-        <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- Knot* Quiltspec::breakpoints -->
-        <var-decl name='breakpoints' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
-      </data-member>
-    </class-decl>
     <!-- struct __jmp_buf_tag -->
     <class-decl name='__jmp_buf_tag' size-in-bits='1600' is-struct='yes' visibility='default' filepath='/usr/include/setjmp.h' line='36' column='1' id='type-id-191'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4461,16 +4452,27 @@
         <var-decl name='__saved_mask' type-id='type-id-216' visibility='default' filepath='/usr/include/setjmp.h' line='43' column='1'/>
       </data-member>
     </class-decl>
+    <!-- enum arc_side -->
+    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-195'>
+      <underlying-type type-id='type-id-9'/>
+      <enumerator name='arc_none' value='0'/>
+      <enumerator name='arc_right' value='1'/>
+      <enumerator name='arc_top' value='2'/>
+      <enumerator name='arc_left' value='3'/>
+      <enumerator name='arc_bottom' value='4'/>
+    </enum-decl>
     <!-- typedef __anonymous_struct__ PFVS -->
-    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-205'/>
+    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-196'/>
     <!-- Knot* -->
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-212'/>
     <!-- Uarray* -->
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-214'/>
+    <!-- struct BezierArc -->
+    <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-208'/>
     <!-- class GridTrimVertex -->
     <class-decl name='GridTrimVertex' size-in-bits='384' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='45' column='1' id='type-id-209'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex GridTrimVertex::dummyt -->
         <var-decl name='dummyt' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='47' column='1'/>
@@ -4498,10 +4500,10 @@
       </member-function>
     </class-decl>
     <!-- class Jarcloc -->
-    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
+    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-213'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Arc_ptr Jarcloc::arc -->
-        <var-decl name='arc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
+        <var-decl name='arc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- TrimVertex* Jarcloc::p -->
@@ -4515,7 +4517,7 @@
     <!-- class PwlArc -->
     <class-decl name='PwlArc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='44' column='1' id='type-id-210'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex* PwlArc::pts -->
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='46' column='1'/>
@@ -4532,7 +4534,7 @@
         <!-- PwlArc::PwlArc() -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4541,7 +4543,7 @@
         <!-- PwlArc::PwlArc(int, TrimVertex*) -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
@@ -4554,7 +4556,7 @@
         <!-- PwlArc::PwlArc(int, TrimVertex*, long int) -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
@@ -4566,15 +4568,8 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-213'>
-      <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
-    </array-type-def>
-    <!-- struct BezierArc -->
-    <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-208'/>
     <!-- struct {void (NurbsTessellator*, void*)* __pfn; long int __delta;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (NurbsTessellator*, void*)* __pfn -->
         <var-decl name='__pfn' type-id='type-id-221' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
@@ -4584,22 +4579,22 @@
         <var-decl name='__delta' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
+    <!-- int[2] -->
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-211'>
+      <!-- <anonymous range>[2] -->
+      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
+    </array-type-def>
     <!-- typedef long int[8] __jmp_buf -->
     <typedef-decl name='__jmp_buf' type-id='type-id-222' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-215'/>
     <!-- typedef __anonymous_struct__2 __sigset_t -->
     <typedef-decl name='__sigset_t' type-id='type-id-223' filepath='/usr/include/bits/sigset.h' line='32' column='1' id='type-id-216'/>
     <!-- GridVertex* -->
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
-    <!-- long int[8] -->
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
-      <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-3' id='type-id-224'/>
-    </array-type-def>
     <!-- struct GridVertex -->
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-219'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int GridVertex::gparam[2] -->
-        <var-decl name='gparam' type-id='type-id-161' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
+        <var-decl name='gparam' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- GridVertex::GridVertex() -->
@@ -4628,15 +4623,20 @@
     <class-decl name='__anonymous_struct__2' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-223'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int __val[16] -->
-        <var-decl name='__val' type-id='type-id-225' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
+        <var-decl name='__val' type-id='type-id-224' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
       </data-member>
     </class-decl>
+    <!-- long int[8] -->
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
+      <!-- <anonymous range>[8] -->
+      <subrange length='8' type-id='type-id-3' id='type-id-225'/>
+    </array-type-def>
     <!-- typedef REAL Knot -->
     <typedef-decl name='Knot' type-id='type-id-1' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-218'/>
     <!-- void (NurbsTessellator*, void*)* -->
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-221'/>
     <!-- unsigned long int[16] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-225'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-224'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-3' id='type-id-227'/>
     </array-type-def>
@@ -4653,59 +4653,59 @@
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
       <data-member access='protected' layout-offset-in-bits='64'>
         <!-- Renderhints NurbsTessellator::renderhints -->
-        <var-decl name='renderhints' type-id='type-id-70' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='320'>
         <!-- Maplist NurbsTessellator::maplist -->
-        <var-decl name='maplist' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
+        <var-decl name='maplist' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='3008'>
         <!-- Backend NurbsTessellator::backend -->
-        <var-decl name='backend' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
+        <var-decl name='backend' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3648'>
         <!-- Subdivider NurbsTessellator::subdivider -->
-        <var-decl name='subdivider' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
+        <var-decl name='subdivider' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24064'>
         <!-- JumpBuffer* NurbsTessellator::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24128'>
         <!-- Pool NurbsTessellator::o_pwlcurvePool -->
-        <var-decl name='o_pwlcurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
+        <var-decl name='o_pwlcurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
         <!-- Pool NurbsTessellator::o_nurbscurvePool -->
-        <var-decl name='o_nurbscurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
+        <var-decl name='o_nurbscurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='29120'>
         <!-- Pool NurbsTessellator::o_curvePool -->
-        <var-decl name='o_curvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
+        <var-decl name='o_curvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='31616'>
         <!-- Pool NurbsTessellator::o_trimPool -->
-        <var-decl name='o_trimPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
+        <var-decl name='o_trimPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='34112'>
         <!-- Pool NurbsTessellator::o_surfacePool -->
-        <var-decl name='o_surfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
+        <var-decl name='o_surfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='36608'>
         <!-- Pool NurbsTessellator::o_nurbssurfacePool -->
-        <var-decl name='o_nurbssurfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
+        <var-decl name='o_nurbssurfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='39104'>
         <!-- Pool NurbsTessellator::propertyPool -->
-        <var-decl name='propertyPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
+        <var-decl name='propertyPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='41600'>
         <!-- Pool NurbsTessellator::quiltPool -->
-        <var-decl name='quiltPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
+        <var-decl name='quiltPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='44096'>
         <!-- TrimVertexPool NurbsTessellator::extTrimVertexPool -->
-        <var-decl name='extTrimVertexPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
+        <var-decl name='extTrimVertexPool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
         <!-- int NurbsTessellator::inSurface -->
@@ -4745,49 +4745,49 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
         <!-- O_trim** NurbsTessellator::nextTrim -->
-        <var-decl name='nextTrim' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
+        <var-decl name='nextTrim' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47104'>
         <!-- O_curve** NurbsTessellator::nextCurve -->
-        <var-decl name='nextCurve' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
+        <var-decl name='nextCurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47168'>
         <!-- O_nurbscurve** NurbsTessellator::nextNurbscurve -->
-        <var-decl name='nextNurbscurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
+        <var-decl name='nextNurbscurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47232'>
         <!-- O_pwlcurve** NurbsTessellator::nextPwlcurve -->
-        <var-decl name='nextPwlcurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
+        <var-decl name='nextPwlcurve' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47296'>
         <!-- O_nurbssurface** NurbsTessellator::nextNurbssurface -->
-        <var-decl name='nextNurbssurface' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
+        <var-decl name='nextNurbssurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47360'>
         <!-- O_surface* NurbsTessellator::currentSurface -->
-        <var-decl name='currentSurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
+        <var-decl name='currentSurface' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47424'>
         <!-- O_trim* NurbsTessellator::currentTrim -->
-        <var-decl name='currentTrim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
+        <var-decl name='currentTrim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47488'>
         <!-- O_curve* NurbsTessellator::currentCurve -->
-        <var-decl name='currentCurve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
+        <var-decl name='currentCurve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47552'>
         <!-- DisplayList* NurbsTessellator::dl -->
-        <var-decl name='dl' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
+        <var-decl name='dl' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- NurbsTessellator::NurbsTessellator(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
         <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- parameter of type 'BasicCurveEvaluator&' -->
-          <parameter type-id='type-id-87'/>
-          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-88'/>
+          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
+          <parameter type-id='type-id-89'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4796,7 +4796,7 @@
         <!-- NurbsTessellator::~NurbsTessellator(int) -->
         <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4807,7 +4807,7 @@
         <!-- void NurbsTessellator::bgnrender() -->
         <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4816,7 +4816,7 @@
         <!-- void NurbsTessellator::endrender() -->
         <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4825,7 +4825,7 @@
         <!-- void NurbsTessellator::makeobj(int) -->
         <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4836,7 +4836,7 @@
         <!-- void NurbsTessellator::closeobj() -->
         <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4845,7 +4845,7 @@
         <!-- void NurbsTessellator::errorHandler(int) -->
         <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4863,7 +4863,7 @@
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <!-- REAL[2] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-160'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-164'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
@@ -4890,7 +4890,7 @@
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
     </array-type-def>
     <!-- long int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-161'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-165'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
@@ -4902,11 +4902,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
         <!-- REAL StoredVertex::coord[2] -->
-        <var-decl name='coord' type-id='type-id-160' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+        <var-decl name='coord' type-id='type-id-164' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- long int StoredVertex::point[2] -->
-        <var-decl name='point' type-id='type-id-161' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+        <var-decl name='point' type-id='type-id-165' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- StoredVertex::StoredVertex() -->
@@ -4937,7 +4937,7 @@
         <!-- BasicSurfaceEvaluator::~BasicSurfaceEvaluator(int) -->
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -4948,7 +4948,7 @@
         <!-- void BasicSurfaceEvaluator::range2f(long int, REAL*, REAL*) -->
         <function-decl name='range2f' mangled-name='_ZN21BasicSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/internals/basicsurfeval.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'REAL*' -->
@@ -4963,7 +4963,7 @@
         <!-- void BasicSurfaceEvaluator::domain2f(REAL, REAL, REAL, REAL) -->
         <function-decl name='domain2f' mangled-name='_ZN21BasicSurfaceEvaluator8domain2fEffff' filepath='libnurbs/internals/basicsurfeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -4980,7 +4980,7 @@
         <!-- void BasicSurfaceEvaluator::enable(long int) -->
         <function-decl name='enable' mangled-name='_ZN21BasicSurfaceEvaluator6enableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -4991,7 +4991,7 @@
         <!-- void BasicSurfaceEvaluator::disable(long int) -->
         <function-decl name='disable' mangled-name='_ZN21BasicSurfaceEvaluator7disableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -5002,7 +5002,7 @@
         <!-- void BasicSurfaceEvaluator::bgnmap2f(long int) -->
         <function-decl name='bgnmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/internals/basicsurfeval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -5013,7 +5013,7 @@
         <!-- void BasicSurfaceEvaluator::map2f(long int, REAL, REAL, long int, long int, REAL, REAL, long int, long int, REAL*) -->
         <function-decl name='map2f' mangled-name='_ZN21BasicSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/internals/basicsurfeval.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5042,7 +5042,7 @@
         <!-- void BasicSurfaceEvaluator::mapgrid2f(long int, REAL, REAL, long int, REAL, REAL) -->
         <function-decl name='mapgrid2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/internals/basicsurfeval.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5063,7 +5063,7 @@
         <!-- void BasicSurfaceEvaluator::mapmesh2f(long int, long int, long int, long int, long int) -->
         <function-decl name='mapmesh2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/internals/basicsurfeval.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
@@ -5082,7 +5082,7 @@
         <!-- void BasicSurfaceEvaluator::evalcoord2f(long int, REAL, REAL) -->
         <function-decl name='evalcoord2f' mangled-name='_ZN21BasicSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/internals/basicsurfeval.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5097,7 +5097,7 @@
         <!-- void BasicSurfaceEvaluator::evalpoint2i(long int, long int) -->
         <function-decl name='evalpoint2i' mangled-name='_ZN21BasicSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/internals/basicsurfeval.cc' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'long int' -->
@@ -5110,7 +5110,7 @@
         <!-- void BasicSurfaceEvaluator::endmap2f() -->
         <function-decl name='endmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8endmap2fEv' filepath='libnurbs/internals/basicsurfeval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5119,7 +5119,7 @@
         <!-- void BasicSurfaceEvaluator::polymode(long int) -->
         <function-decl name='polymode' mangled-name='_ZN21BasicSurfaceEvaluator8polymodeEl' filepath='libnurbs/internals/basicsurfeval.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -5130,7 +5130,7 @@
         <!-- void BasicSurfaceEvaluator::bgnline() -->
         <function-decl name='bgnline' mangled-name='_ZN21BasicSurfaceEvaluator7bgnlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5139,7 +5139,7 @@
         <!-- void BasicSurfaceEvaluator::endline() -->
         <function-decl name='endline' mangled-name='_ZN21BasicSurfaceEvaluator7endlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5148,7 +5148,7 @@
         <!-- void BasicSurfaceEvaluator::bgnclosedline() -->
         <function-decl name='bgnclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5157,7 +5157,7 @@
         <!-- void BasicSurfaceEvaluator::endclosedline() -->
         <function-decl name='endclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5166,7 +5166,7 @@
         <!-- void BasicSurfaceEvaluator::bgntmesh() -->
         <function-decl name='bgntmesh' mangled-name='_ZN21BasicSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5175,7 +5175,7 @@
         <!-- void BasicSurfaceEvaluator::swaptmesh() -->
         <function-decl name='swaptmesh' mangled-name='_ZN21BasicSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5184,7 +5184,7 @@
         <!-- void BasicSurfaceEvaluator::endtmesh() -->
         <function-decl name='endtmesh' mangled-name='_ZN21BasicSurfaceEvaluator8endtmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5193,7 +5193,7 @@
         <!-- void BasicSurfaceEvaluator::bgnqstrip() -->
         <function-decl name='bgnqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5202,7 +5202,7 @@
         <!-- void BasicSurfaceEvaluator::endqstrip() -->
         <function-decl name='endqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9endqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5211,7 +5211,7 @@
         <!-- void BasicSurfaceEvaluator::bgntfan() -->
         <function-decl name='bgntfan' mangled-name='_ZN21BasicSurfaceEvaluator7bgntfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5220,7 +5220,7 @@
         <!-- void BasicSurfaceEvaluator::endtfan() -->
         <function-decl name='endtfan' mangled-name='_ZN21BasicSurfaceEvaluator7endtfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5229,7 +5229,7 @@
         <!-- void BasicSurfaceEvaluator::evalUStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalUStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5250,7 +5250,7 @@
         <!-- void BasicSurfaceEvaluator::evalVStrip(int, REAL, REAL*, int, REAL, REAL*) -->
         <function-decl name='evalVStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5271,7 +5271,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE' mangled-name='_ZN21BasicSurfaceEvaluator18inDoEvalCoord2NOGEEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5288,7 +5288,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE_BU(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BU' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BUEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5305,7 +5305,7 @@
         <!-- void BasicSurfaceEvaluator::inDoEvalCoord2NOGE_BV(REAL, REAL, REAL*, REAL*) -->
         <function-decl name='inDoEvalCoord2NOGE_BV' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BVEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -5322,7 +5322,7 @@
         <!-- void BasicSurfaceEvaluator::inPreEvaluateBV_intfac(REAL) -->
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
@@ -5333,7 +5333,7 @@
         <!-- void BasicSurfaceEvaluator::inPreEvaluateBU_intfac(REAL) -->
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'BasicSurfaceEvaluator*' -->
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- void -->
@@ -5529,7 +5529,7 @@
       </data-member>
     </class-decl>
     <!-- BasicSurfaceEvaluator* -->
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-70'/>
     <!-- GLenum* -->
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-134'/>
     <!-- REAL[3]* -->
@@ -5557,14 +5557,14 @@
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-143'/>
     <!-- char*[32] -->
-    <array-type-def dimensions='1' type-id='type-id-111' size-in-bits='2048' id='type-id-110'>
+    <array-type-def dimensions='1' type-id='type-id-115' size-in-bits='2048' id='type-id-114'>
       <!-- <anonymous range>[32] -->
       <subrange length='32' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
     <!-- struct Arc -->
     <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' static='yes'>
         <!-- static const int Arc::bezier_tag -->
         <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
@@ -5579,23 +5579,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Arc_ptr Arc::prev -->
-        <var-decl name='prev' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
+        <var-decl name='prev' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Arc_ptr Arc::next -->
-        <var-decl name='next' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
+        <var-decl name='next' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- Arc_ptr Arc::link -->
-        <var-decl name='link' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
+        <var-decl name='link' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- BezierArc* Arc::bezierArc -->
-        <var-decl name='bezierArc' type-id='type-id-202' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
+        <var-decl name='bezierArc' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- PwlArc* Arc::pwlArc -->
-        <var-decl name='pwlArc' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
+        <var-decl name='pwlArc' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- long int Arc::type -->
@@ -5613,7 +5613,7 @@
           <!-- parameter of type 'Arc*' -->
           <parameter type-id='type-id-167'/>
           <!-- parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203'/>
+          <parameter type-id='type-id-194'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5624,7 +5624,7 @@
           <!-- implicit parameter of type 'Arc*' -->
           <parameter type-id='type-id-167' is-artificial='yes'/>
           <!-- parameter of type 'enum arc_side' -->
-          <parameter type-id='type-id-204'/>
+          <parameter type-id='type-id-195'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- void -->
@@ -5633,10 +5633,10 @@
       </member-function>
     </class-decl>
     <!-- class Pool -->
-    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-75'>
+    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-76'>
       <member-type access='protected'>
         <!-- enum Pool::Magic -->
-        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-108'>
+        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-112'>
           <underlying-type type-id='type-id-9'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
@@ -5644,11 +5644,11 @@
       </member-type>
       <data-member access='protected' layout-offset-in-bits='0'>
         <!-- Buffer* Pool::freelist -->
-        <var-decl name='freelist' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
+        <var-decl name='freelist' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
         <!-- char* Pool::blocklist[32] -->
-        <var-decl name='blocklist' type-id='type-id-110' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
+        <var-decl name='blocklist' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <!-- int Pool::nextblock -->
@@ -5656,7 +5656,7 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
         <!-- char* Pool::curblock -->
-        <var-decl name='curblock' type-id='type-id-111' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
+        <var-decl name='curblock' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <!-- int Pool::buffersize -->
@@ -5676,23 +5676,23 @@
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
         <!-- const char* Pool::name -->
-        <var-decl name='name' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
+        <var-decl name='name' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2432'>
         <!-- Pool::Magic Pool::magic -->
-        <var-decl name='magic' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
+        <var-decl name='magic' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Pool::Pool(int, int, const char*) -->
         <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Pool*' -->
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'const char*' -->
-          <parameter type-id='type-id-112'/>
+          <parameter type-id='type-id-116'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5701,7 +5701,7 @@
         <!-- Pool::~Pool(int) -->
         <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Pool*' -->
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -5715,16 +5715,16 @@
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-135'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Buffer* Buffer::next -->
-        <var-decl name='next' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
+        <var-decl name='next' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
       </data-member>
     </class-decl>
     <!-- class PooledObj -->
-    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-164'/>
+    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-157'/>
     <!-- struct TrimVertex -->
     <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-172'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL TrimVertex::param[2] -->
-        <var-decl name='param' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+        <var-decl name='param' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int TrimVertex::nuid -->
@@ -5732,9 +5732,9 @@
       </data-member>
     </class-decl>
     <!-- typedef Arc* Arc_ptr -->
-    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-119'/>
+    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-124'/>
     <!-- enum arc_side -->
-    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-204'>
+    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-195'>
       <underlying-type type-id='type-id-9'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
@@ -5745,7 +5745,7 @@
     <!-- class PwlArc -->
     <class-decl name='PwlArc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='44' column='1' id='type-id-210'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex* PwlArc::pts -->
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='46' column='1'/>
@@ -5762,7 +5762,7 @@
         <!-- PwlArc::PwlArc() -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5771,7 +5771,7 @@
         <!-- PwlArc::PwlArc(int, TrimVertex*) -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
@@ -5784,7 +5784,7 @@
         <!-- PwlArc::PwlArc(int, TrimVertex*, long int) -->
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'PwlArc*' -->
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'TrimVertex*' -->
@@ -5801,33 +5801,33 @@
     <!-- Arc* const -->
     <qualified-type-def type-id='type-id-167' const='yes' id='type-id-239'/>
     <!-- Arc_ptr* -->
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-240'/>
     <!-- BezierArc* -->
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-193'/>
     <!-- Buffer* -->
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-113'/>
     <!-- Pool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-75' size-in-bits='64' id='type-id-150'/>
+    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-150'/>
     <!-- Pool* -->
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-117'/>
     <!-- PooledObj* -->
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-241'/>
     <!-- PwlArc* -->
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-194'/>
     <!-- TrimVertex* -->
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-141'/>
     <!-- char* -->
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-115'/>
     <!-- const char -->
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-162'/>
+    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-166'/>
     <!-- const char* -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-116'/>
     <!-- const int -->
     <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[4] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-127'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
@@ -5841,7 +5841,7 @@
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
     <!-- struct Renderhints -->
-    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-70'>
+    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-71'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Renderhints::display_method -->
         <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
@@ -5878,7 +5878,7 @@
         <!-- Renderhints::Renderhints() -->
         <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Renderhints*' -->
-          <parameter type-id='type-id-129' is-artificial='yes'/>
+          <parameter type-id='type-id-118' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5894,7 +5894,7 @@
         <!-- Sorter::Sorter(int) -->
         <function-decl name='Sorter' filepath='libnurbs/internals/sorter.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -5905,7 +5905,7 @@
         <!-- Sorter::~Sorter(int) -->
         <function-decl name='~Sorter' filepath='libnurbs/internals/sorter.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -5916,11 +5916,11 @@
         <!-- int Sorter::qscmp(char*, char*) -->
         <function-decl name='qscmp' mangled-name='_ZN6Sorter5qscmpEPcS0_' filepath='libnurbs/internals/sorter.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -5929,11 +5929,11 @@
         <!-- void Sorter::qsexc(char*, char*) -->
         <function-decl name='qsexc' mangled-name='_ZN6Sorter5qsexcEPcS0_' filepath='libnurbs/internals/sorter.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5942,13 +5942,13 @@
         <!-- void Sorter::qstexc(char*, char*, char*) -->
         <function-decl name='qstexc' mangled-name='_ZN6Sorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/sorter.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Sorter*' -->
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -5979,9 +5979,9 @@
           <!-- implicit parameter of type 'ArcSorter*' -->
           <parameter type-id='type-id-244' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -5992,9 +5992,9 @@
           <!-- implicit parameter of type 'ArcSorter*' -->
           <parameter type-id='type-id-244' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6005,11 +6005,11 @@
           <!-- implicit parameter of type 'ArcSorter*' -->
           <parameter type-id='type-id-244' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6045,9 +6045,9 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -6058,9 +6058,9 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6071,21 +6071,21 @@
           <!-- implicit parameter of type 'FlistSorter*' -->
           <parameter type-id='type-id-177' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- struct TrimVertexPool -->
-    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-76'>
+    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-77'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool TrimVertexPool::pool -->
-        <var-decl name='pool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='pool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- TrimVertex** TrimVertexPool::vlist -->
@@ -6123,10 +6123,10 @@
     <!-- struct Quilt -->
     <class-decl name='Quilt' size-in-bits='896' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='64' column='1' id='type-id-140'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Mapdesc* Quilt::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- REAL* Quilt::cpts -->
@@ -6142,29 +6142,29 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- Quilt* Quilt::next -->
-        <var-decl name='next' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Quilt::Quilt(Mapdesc*) -->
         <function-decl name='Quilt' filepath='libnurbs/internals/quilt.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120' is-artificial='yes'/>
+          <parameter type-id='type-id-125' is-artificial='yes'/>
           <!-- parameter of type 'Mapdesc*' -->
-          <parameter type-id='type-id-103'/>
+          <parameter type-id='type-id-107'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class Bin -->
-    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-118'>
+    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-123'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Arc_ptr Bin::head -->
-        <var-decl name='head' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
+        <var-decl name='head' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Arc_ptr Bin::current -->
-        <var-decl name='current' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
+        <var-decl name='current' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Bin::Bin() -->
@@ -6188,7 +6188,7 @@
       </member-function>
     </class-decl>
     <!-- class ArcTessellator -->
-    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-116'>
+    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-121'>
       <data-member access='private' static='yes'>
         <!-- static REAL ArcTessellator::gl_Bernstein[][24][24] -->
         <var-decl name='gl_Bernstein' type-id='type-id-145' mangled-name='_ZN14ArcTessellator12gl_BernsteinE' visibility='default' filepath='libnurbs/internals/arctess.h' line='60' column='1'/>
@@ -6250,7 +6250,7 @@
           <!-- implicit parameter of type 'Curvelist*' -->
           <parameter type-id='type-id-249' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -6285,14 +6285,14 @@
       </member-function>
     </class-decl>
     <!-- struct Backend -->
-    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-72'>
+    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-73'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- BasicCurveEvaluator& Backend::curveEvaluator -->
-        <var-decl name='curveEvaluator' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- BasicSurfaceEvaluator& Backend::surfaceEvaluator -->
-        <var-decl name='surfaceEvaluator' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
+        <var-decl name='surfaceEvaluator' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Backend::wireframetris -->
@@ -6308,7 +6308,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
         <!-- REAL Backend::mesh[3][4] -->
-        <var-decl name='mesh' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
+        <var-decl name='mesh' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <!-- int Backend::meshindex -->
@@ -6318,21 +6318,21 @@
         <!-- Backend::Backend(BasicCurveEvaluator&, BasicSurfaceEvaluator&) -->
         <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Backend*' -->
-          <parameter type-id='type-id-128' is-artificial='yes'/>
+          <parameter type-id='type-id-106' is-artificial='yes'/>
           <!-- parameter of type 'BasicCurveEvaluator&' -->
-          <parameter type-id='type-id-87'/>
-          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
           <parameter type-id='type-id-88'/>
+          <!-- parameter of type 'BasicSurfaceEvaluator&' -->
+          <parameter type-id='type-id-89'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class Subdivider -->
-    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-73'>
+    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-74'>
       <member-type access='private'>
         <!-- enum Subdivider::dir -->
-        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-114'>
+        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-119'>
           <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
@@ -6342,47 +6342,47 @@
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Slicer Subdivider::slicer -->
-        <var-decl name='slicer' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
+        <var-decl name='slicer' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8064'>
         <!-- ArcTessellator Subdivider::arctessellator -->
-        <var-decl name='arctessellator' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
+        <var-decl name='arctessellator' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8192'>
         <!-- Pool Subdivider::arcpool -->
-        <var-decl name='arcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+        <var-decl name='arcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='10688'>
         <!-- Pool Subdivider::bezierarcpool -->
-        <var-decl name='bezierarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+        <var-decl name='bezierarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13184'>
         <!-- Pool Subdivider::pwlarcpool -->
-        <var-decl name='pwlarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+        <var-decl name='pwlarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='15680'>
         <!-- TrimVertexPool Subdivider::trimvertexpool -->
-        <var-decl name='trimvertexpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+        <var-decl name='trimvertexpool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18304'>
         <!-- JumpBuffer* Subdivider::jumpbuffer -->
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18368'>
         <!-- Renderhints& Subdivider::renderhints -->
-        <var-decl name='renderhints' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18432'>
         <!-- Backend& Subdivider::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18496'>
         <!-- Bin Subdivider::initialbin -->
-        <var-decl name='initialbin' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
+        <var-decl name='initialbin' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18624'>
         <!-- Arc_ptr Subdivider::pjarc -->
-        <var-decl name='pjarc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
+        <var-decl name='pjarc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <!-- int Subdivider::s_index -->
@@ -6394,27 +6394,27 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
         <!-- Quilt* Subdivider::qlist -->
-        <var-decl name='qlist' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
+        <var-decl name='qlist' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18816'>
         <!-- Flist Subdivider::spbrkpts -->
-        <var-decl name='spbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
+        <var-decl name='spbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19136'>
         <!-- Flist Subdivider::tpbrkpts -->
-        <var-decl name='tpbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
+        <var-decl name='tpbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19456'>
         <!-- Flist Subdivider::smbrkpts -->
-        <var-decl name='smbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
+        <var-decl name='smbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19776'>
         <!-- Flist Subdivider::tmbrkpts -->
-        <var-decl name='tmbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
+        <var-decl name='tmbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20096'>
         <!-- REAL Subdivider::stepsizes[4] -->
-        <var-decl name='stepsizes' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
+        <var-decl name='stepsizes' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <!-- int Subdivider::showDegenerate -->
@@ -6440,11 +6440,11 @@
         <!-- Subdivider::Subdivider(Renderhints&, Backend&) -->
         <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Subdivider*' -->
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- parameter of type 'Renderhints&' -->
-          <parameter type-id='type-id-124'/>
+          <parameter type-id='type-id-129'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6453,7 +6453,7 @@
         <!-- Subdivider::~Subdivider(int) -->
         <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Subdivider*' -->
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -6462,7 +6462,7 @@
       </member-function>
     </class-decl>
     <!-- class Flist -->
-    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-121'>
+    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-126'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- REAL* Flist::pts -->
         <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
@@ -6525,9 +6525,9 @@
           <!-- implicit parameter of type 'ArcSdirSorter*' -->
           <parameter type-id='type-id-252' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -6554,9 +6554,9 @@
           <!-- implicit parameter of type 'ArcTdirSorter*' -->
           <parameter type-id='type-id-254' is-artificial='yes'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- parameter of type 'char*' -->
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
           <!-- int -->
           <return type-id='type-id-11'/>
         </function-decl>
@@ -6586,7 +6586,7 @@
           <!-- implicit parameter of type 'Patchlist*' -->
           <parameter type-id='type-id-258' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
@@ -6623,14 +6623,14 @@
       </member-function>
     </class-decl>
     <!-- class Slicer -->
-    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-115'>
+    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-120'>
       <!-- class CoveAndTiler -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
       <!-- class Mesher -->
-      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-157'/>
+      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-161'/>
       <data-member access='private' layout-offset-in-bits='5248'>
         <!-- Backend& Slicer::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5312'>
         <!-- REAL Slicer::oneOverDu -->
@@ -6660,13 +6660,13 @@
         <!-- Slicer::Slicer(int, void**, Backend&) -->
         <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Slicer*' -->
-          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6675,11 +6675,11 @@
         <!-- Slicer::~Slicer(int, void**) -->
         <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Slicer*' -->
-          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -6689,7 +6689,7 @@
     <class-decl name='JumpBuffer' size-in-bits='1600' is-struct='yes' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='56' column='1' id='type-id-95'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- jmp_buf JumpBuffer::buf -->
-        <var-decl name='buf' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
+        <var-decl name='buf' type-id='type-id-156' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <!-- Arc** -->
@@ -6703,47 +6703,47 @@
     <!-- ArcTdirSorter* -->
     <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-254'/>
     <!-- ArcTessellator* -->
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-148'/>
     <!-- Backend& -->
-    <qualified-type-def type-id='type-id-107' id='type-id-105'/>
+    <qualified-type-def type-id='type-id-111' id='type-id-109'/>
     <!-- Backend& -->
-    <reference-type-def kind='lvalue' type-id='type-id-72' size-in-bits='64' id='type-id-107'/>
+    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-111'/>
     <!-- Bin& -->
-    <reference-type-def kind='lvalue' type-id='type-id-118' size-in-bits='64' id='type-id-262'/>
+    <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-262'/>
     <!-- Bin* -->
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-151'/>
     <!-- Curvelist& -->
     <reference-type-def kind='lvalue' type-id='type-id-246' size-in-bits='64' id='type-id-250'/>
     <!-- Flist* -->
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-155'/>
     <!-- JumpBuffer* -->
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-74'/>
+    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-75'/>
     <!-- Patchlist& -->
     <reference-type-def kind='lvalue' type-id='type-id-255' size-in-bits='64' id='type-id-259'/>
     <!-- Pool& -->
     <qualified-type-def type-id='type-id-150' id='type-id-146'/>
     <!-- Quilt* -->
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-120'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-125'/>
     <!-- Renderhints& -->
-    <qualified-type-def type-id='type-id-124' id='type-id-117'/>
+    <qualified-type-def type-id='type-id-129' id='type-id-122'/>
     <!-- Renderhints& -->
-    <reference-type-def kind='lvalue' type-id='type-id-70' size-in-bits='64' id='type-id-124'/>
+    <reference-type-def kind='lvalue' type-id='type-id-71' size-in-bits='64' id='type-id-129'/>
     <!-- Sorter* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-202'/>
     <!-- Subdivider& -->
     <qualified-type-def type-id='type-id-245' id='type-id-243'/>
     <!-- Subdivider& -->
-    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-74' size-in-bits='64' id='type-id-245'/>
     <!-- Subdivider* -->
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-123'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-128'/>
     <!-- TrimVertex** -->
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-130'/>
     <!-- TrimVertexPool& -->
     <qualified-type-def type-id='type-id-149' id='type-id-147'/>
     <!-- TrimVertexPool& -->
-    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-149'/>
+    <reference-type-def kind='lvalue' type-id='type-id-77' size-in-bits='64' id='type-id-149'/>
     <!-- TrimVertexPool* -->
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-131'/>
     <!-- const REAL -->
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-263'/>
     <!-- const REAL* -->
@@ -6774,7 +6774,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Mapdesc* Curve::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
@@ -6818,7 +6818,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-247' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -6849,7 +6849,7 @@
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-266'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Mapdesc* Patch::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Patch* Patch::next -->
@@ -6893,7 +6893,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-256' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
@@ -6930,7 +6930,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL Pspec::sidestep[2] -->
-        <var-decl name='sidestep' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
+        <var-decl name='sidestep' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- REAL Pspec::stepsize -->
@@ -6989,11 +6989,11 @@
     <!-- ArcTessellator* const -->
     <qualified-type-def type-id='type-id-148' const='yes' id='type-id-277'/>
     <!-- Pool* const -->
-    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-117' const='yes' id='type-id-278'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[3][4] -->
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
+    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-105'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
       <!-- <anonymous range>[4] -->
@@ -7003,7 +7003,7 @@
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-219'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int GridVertex::gparam[2] -->
-        <var-decl name='gparam' type-id='type-id-161' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
+        <var-decl name='gparam' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- GridVertex::GridVertex() -->
@@ -7031,7 +7031,7 @@
     <!-- class GridTrimVertex -->
     <class-decl name='GridTrimVertex' size-in-bits='384' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='45' column='1' id='type-id-209'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex GridTrimVertex::dummyt -->
         <var-decl name='dummyt' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='47' column='1'/>
@@ -7059,17 +7059,17 @@
       </member-function>
     </class-decl>
     <!-- Backend* -->
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-106'/>
     <!-- Backend* const -->
-    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-279'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-279'/>
     <!-- BasicCurveEvaluator& -->
-    <qualified-type-def type-id='type-id-87' id='type-id-125'/>
+    <qualified-type-def type-id='type-id-88' id='type-id-103'/>
     <!-- BasicCurveEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-87'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-88'/>
     <!-- BasicSurfaceEvaluator& -->
-    <qualified-type-def type-id='type-id-88' id='type-id-126'/>
+    <qualified-type-def type-id='type-id-89' id='type-id-104'/>
     <!-- BasicSurfaceEvaluator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-88'/>
+    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-89'/>
     <!-- GridTrimVertex* -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-188'/>
     <!-- GridTrimVertex* const -->
@@ -7085,14 +7085,14 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Subdivider* const -->
-    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-282'/>
+    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-282'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class Jarcloc -->
-    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
+    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-213'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Arc_ptr Jarcloc::arc -->
-        <var-decl name='arc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
+        <var-decl name='arc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- TrimVertex* Jarcloc::p -->
@@ -7104,7 +7104,7 @@
       </data-member>
     </class-decl>
     <!-- class Trimline -->
-    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-196'>
+    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-200'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- TrimVertex** Trimline::pts -->
         <var-decl name='pts' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimline.h' line='48' column='1'/>
@@ -7123,7 +7123,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
         <!-- Jarcloc Trimline::jarcl -->
-        <var-decl name='jarcl' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
+        <var-decl name='jarcl' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- TrimVertex Trimline::t -->
@@ -7145,7 +7145,7 @@
         <!-- Trimline::Trimline() -->
         <function-decl name='Trimline' filepath='libnurbs/internals/trimline.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Trimline*' -->
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7154,7 +7154,7 @@
         <!-- Trimline::~Trimline(int) -->
         <function-decl name='~Trimline' filepath='libnurbs/internals/trimline.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Trimline*' -->
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -7166,23 +7166,23 @@
     <class-decl name='TrimRegion' size-in-bits='2560' visibility='default' filepath='libnurbs/internals/trimregion.h' line='46' column='1' id='type-id-173'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Trimline TrimRegion::left -->
-        <var-decl name='left' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
+        <var-decl name='left' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
         <!-- Trimline TrimRegion::right -->
-        <var-decl name='right' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
+        <var-decl name='right' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
         <!-- Gridline TrimRegion::top -->
-        <var-decl name='top' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
+        <var-decl name='top' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1984'>
         <!-- Gridline TrimRegion::bot -->
-        <var-decl name='bot' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
+        <var-decl name='bot' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
         <!-- Uarray TrimRegion::uarray -->
-        <var-decl name='uarray' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
+        <var-decl name='uarray' type-id='type-id-204' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- REAL TrimRegion::oneOverDu -->
@@ -7192,14 +7192,14 @@
         <!-- TrimRegion::TrimRegion() -->
         <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TrimRegion*' -->
-          <parameter type-id='type-id-201' is-artificial='yes'/>
+          <parameter type-id='type-id-205' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- class Uarray -->
-    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-200'>
+    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-204'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- long int Uarray::size -->
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
@@ -7216,7 +7216,7 @@
         <!-- Uarray::Uarray() -->
         <function-decl name='Uarray' filepath='libnurbs/internals/uarray.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Uarray*' -->
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7225,7 +7225,7 @@
         <!-- Uarray::~Uarray(int) -->
         <function-decl name='~Uarray' filepath='libnurbs/internals/uarray.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Uarray*' -->
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -7234,7 +7234,7 @@
       </member-function>
     </class-decl>
     <!-- struct Gridline -->
-    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-199'>
+    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-203'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Gridline::v -->
         <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
@@ -7257,12 +7257,12 @@
       </data-member>
     </class-decl>
     <!-- class CoveAndTiler -->
-    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-156'>
+    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-160'>
       <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Backend& CoveAndTiler::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
         <!-- static const int CoveAndTiler::MAXSTRIPSIZE -->
@@ -7276,9 +7276,9 @@
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7291,14 +7291,14 @@
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- CoveAndTiler* -->
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-175'/>
     <!-- CoveAndTiler* const -->
     <qualified-type-def type-id='type-id-175' const='yes' id='type-id-283'/>
     <!-- GridTrimVertex& -->
@@ -7312,15 +7312,15 @@
     <!-- GridVertex* const -->
     <qualified-type-def type-id='type-id-220' const='yes' id='type-id-288'/>
     <!-- Jarcloc* -->
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-289'/>
     <!-- TrimRegion* -->
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-205'/>
     <!-- Trimline* -->
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-198'/>
     <!-- Trimline* const -->
-    <qualified-type-def type-id='type-id-194' const='yes' id='type-id-290'/>
+    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-290'/>
     <!-- Uarray* -->
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-214'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Quiltspec[2] -->
@@ -7334,7 +7334,7 @@
       <subrange length='120' type-id='type-id-3' id='type-id-275'/>
     </array-type-def>
     <!-- REAL[5] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-183'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-178'>
       <!-- <anonymous range>[5] -->
       <subrange length='5' type-id='type-id-3' id='type-id-190'/>
     </array-type-def>
@@ -7351,7 +7351,7 @@
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
     <!-- int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-213'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-211'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
@@ -7363,7 +7363,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Mapdesc* Curve::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- int Curve::stride -->
@@ -7407,7 +7407,7 @@
           <!-- implicit parameter of type 'Curve*' -->
           <parameter type-id='type-id-247' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'typedef REAL' -->
           <parameter type-id='type-id-1'/>
           <!-- parameter of type 'typedef REAL' -->
@@ -7435,11 +7435,11 @@
       </member-function>
     </class-decl>
     <!-- typedef REAL[5][5] Maxmatrix -->
-    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-184'/>
+    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-179'/>
     <!-- struct Mapdesc -->
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-136'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- REAL Mapdesc::pixel_tolerance -->
         <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
@@ -7474,7 +7474,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- REAL Mapdesc::bboxsize[5] -->
-        <var-decl name='bboxsize' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
+        <var-decl name='bboxsize' type-id='type-id-178' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <!-- long int Mapdesc::type -->
@@ -7502,15 +7502,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
         <!-- Maxmatrix Mapdesc::bmat -->
-        <var-decl name='bmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
+        <var-decl name='bmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
         <!-- Maxmatrix Mapdesc::cmat -->
-        <var-decl name='cmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
+        <var-decl name='cmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2272'>
         <!-- Maxmatrix Mapdesc::smat -->
-        <var-decl name='smat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
+        <var-decl name='smat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <!-- REAL Mapdesc::s_steps -->
@@ -7534,17 +7534,17 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
         <!-- Mapdesc* Mapdesc::next -->
-        <var-decl name='next' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
+        <var-decl name='next' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3328'>
         <!-- Backend& Mapdesc::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Mapdesc::Mapdesc(long int, int, int, Backend&) -->
         <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mapdesc*' -->
-          <parameter type-id='type-id-103' is-artificial='yes'/>
+          <parameter type-id='type-id-107' is-artificial='yes'/>
           <!-- parameter of type 'long int' -->
           <parameter type-id='type-id-15'/>
           <!-- parameter of type 'int' -->
@@ -7552,7 +7552,7 @@
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-11'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7574,7 +7574,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- Knot* Knotvector::knotlist -->
-        <var-decl name='knotlist' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/knotvector.h' line='51' column='1'/>
+        <var-decl name='knotlist' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/knotvector.h' line='51' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- Knotvector::Knotvector() -->
@@ -7621,7 +7621,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- int Quiltspec::bdry[2] -->
-        <var-decl name='bdry' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
+        <var-decl name='bdry' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- REAL Quiltspec::step_size -->
@@ -7629,7 +7629,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- Knot* Quiltspec::breakpoints -->
-        <var-decl name='breakpoints' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
+        <var-decl name='breakpoints' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef REAL Knot -->
@@ -7643,19 +7643,19 @@
     <!-- Curve* const -->
     <qualified-type-def type-id='type-id-247' const='yes' id='type-id-294'/>
     <!-- Flist& -->
-    <reference-type-def kind='lvalue' type-id='type-id-121' size-in-bits='64' id='type-id-295'/>
+    <reference-type-def kind='lvalue' type-id='type-id-126' size-in-bits='64' id='type-id-295'/>
     <!-- Knot* -->
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-212'/>
     <!-- Knotvector& -->
     <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-296'/>
     <!-- Mapdesc* -->
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-107'/>
     <!-- Mapdesc* const -->
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-297'/>
     <!-- Quiltspec* -->
     <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-207'/>
     <!-- REAL[5]* -->
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-298'/>
     <!-- float[4]* -->
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-299'/>
     <!-- Knotvector* -->
@@ -7680,10 +7680,10 @@
     <!-- struct Dlnode -->
     <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- PFVS Dlnode::work -->
-        <var-decl name='work' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
+        <var-decl name='work' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* Dlnode::arg -->
@@ -7691,7 +7691,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- PFVS Dlnode::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- Dlnode* Dlnode::next -->
@@ -7703,20 +7703,20 @@
           <!-- implicit parameter of type 'Dlnode*' -->
           <parameter type-id='type-id-152' is-artificial='yes'/>
           <!-- parameter of type 'typedef PFVS' -->
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-196'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-25'/>
           <!-- parameter of type 'typedef PFVS' -->
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-196'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef __anonymous_struct__ PFVS -->
-    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-205'/>
+    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-196'/>
     <!-- struct {void (NurbsTessellator*, void*)* __pfn; long int __delta;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (NurbsTessellator*, void*)* __pfn -->
         <var-decl name='__pfn' type-id='type-id-221' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
@@ -7734,7 +7734,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Pool DisplayList::dlnodePool -->
-        <var-decl name='dlnodePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
+        <var-decl name='dlnodePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- Dlnode** DisplayList::lastNode -->
@@ -7742,15 +7742,15 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
         <!-- NurbsTessellator* DisplayList::nt -->
-        <var-decl name='nt' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
+        <var-decl name='nt' type-id='type-id-87' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- DisplayList::DisplayList(NurbsTessellator*) -->
         <function-decl name='DisplayList' filepath='libnurbs/internals/displaylist.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DisplayList*' -->
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- parameter of type 'NurbsTessellator*' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7759,7 +7759,7 @@
         <!-- DisplayList::~DisplayList(int) -->
         <function-decl name='~DisplayList' filepath='libnurbs/internals/displaylist.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'DisplayList*' -->
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- void -->
@@ -7768,21 +7768,21 @@
       </member-function>
     </class-decl>
     <!-- DisplayList* -->
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-85'/>
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-86'/>
     <!-- DisplayList* const -->
-    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-302'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-302'/>
     <!-- Dlnode* -->
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-152'/>
     <!-- Dlnode** -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
     <!-- NurbsTessellator* -->
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-87'/>
     <!-- void (NurbsTessellator*, void*)* -->
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-221'/>
     <!-- void (NurbsTessellator*, void*) -->
     <function-type size-in-bits='64' id='type-id-226'>
       <!-- implicit parameter of type 'NurbsTessellator*' -->
-      <parameter type-id='type-id-86' is-artificial='yes'/>
+      <parameter type-id='type-id-87' is-artificial='yes'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-25'/>
       <!-- void -->
@@ -7801,23 +7801,23 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class Hull -->
-    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
+    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-180'>
       <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <member-type access='private'>
         <!-- struct Hull::Side -->
-        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-193'>
+        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-197'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- Trimline* Hull::Side::left -->
-            <var-decl name='left' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
+            <var-decl name='left' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- Gridline* Hull::Side::line -->
-            <var-decl name='line' type-id='type-id-195' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
+            <var-decl name='line' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- Trimline* Hull::Side::right -->
-            <var-decl name='right' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
+            <var-decl name='right' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- long int Hull::Side::index -->
@@ -7827,29 +7827,29 @@
       </member-type>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Hull::Side Hull::lower -->
-        <var-decl name='lower' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
+        <var-decl name='lower' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
         <!-- Hull::Side Hull::upper -->
-        <var-decl name='upper' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
+        <var-decl name='upper' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
         <!-- Trimline Hull::fakeleft -->
-        <var-decl name='fakeleft' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
+        <var-decl name='fakeleft' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
         <!-- Trimline Hull::fakeright -->
-        <var-decl name='fakeright' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
+        <var-decl name='fakeright' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Hull::Hull(int, void**) -->
         <function-decl name='Hull' filepath='libnurbs/internals/hull.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Hull*' -->
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7858,22 +7858,22 @@
         <!-- Hull::~Hull(int, void**) -->
         <function-decl name='~Hull' filepath='libnurbs/internals/hull.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Hull*' -->
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- Gridline* -->
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-199'/>
     <!-- Hull* -->
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-197'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-201'/>
     <!-- Hull* const -->
-    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-305'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Bin& -->
@@ -7891,67 +7891,67 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class Maplist -->
-    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
+    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-72'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Pool Maplist::mapdescPool -->
-        <var-decl name='mapdescPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+        <var-decl name='mapdescPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <!-- Mapdesc* Maplist::maps -->
-        <var-decl name='maps' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
+        <var-decl name='maps' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <!-- Mapdesc** Maplist::lastmap -->
-        <var-decl name='lastmap' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+        <var-decl name='lastmap' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
         <!-- Backend& Maplist::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <!-- Maplist::Maplist(Backend&) -->
         <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Maplist*' -->
-          <parameter type-id='type-id-106' is-artificial='yes'/>
+          <parameter type-id='type-id-110' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- Mapdesc** -->
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
     <!-- Maplist* -->
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-110'/>
     <!-- Maplist* const -->
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-308'/>
     <!-- PooledObj* const -->
     <qualified-type-def type-id='type-id-241' const='yes' id='type-id-309'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- GridTrimVertex*[2] -->
-    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
+    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-183'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <!-- class Mesher -->
-    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-157'>
+    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-161'>
       <!-- class TrimRegion -->
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <!-- class Hull -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
       <data-member access='private' static='yes'>
         <!-- static const float Mesher::ZERO -->
-        <var-decl name='ZERO' type-id='type-id-179' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
+        <var-decl name='ZERO' type-id='type-id-181' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2240'>
         <!-- Backend& Mesher::backend -->
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
         <!-- Pool Mesher::p -->
-        <var-decl name='p' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
+        <var-decl name='p' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4800'>
         <!-- unsigned int Mesher::stacksize -->
@@ -7959,11 +7959,11 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='4864'>
         <!-- GridTrimVertex** Mesher::vdata -->
-        <var-decl name='vdata' type-id='type-id-180' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
+        <var-decl name='vdata' type-id='type-id-182' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4928'>
         <!-- GridTrimVertex* Mesher::last[2] -->
-        <var-decl name='last' type-id='type-id-181' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
+        <var-decl name='last' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
         <!-- int Mesher::itop -->
@@ -7977,13 +7977,13 @@
         <!-- Mesher::Mesher(int, void**, Backend&) -->
         <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mesher*' -->
-          <parameter type-id='type-id-182' is-artificial='yes'/>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- parameter of type 'Backend&' -->
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -7992,24 +7992,24 @@
         <!-- Mesher::~Mesher(int, void**) -->
         <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'Mesher*' -->
-          <parameter type-id='type-id-182' is-artificial='yes'/>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
           <!-- artificial parameter of type 'int' -->
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <!-- artificial parameter of type 'void**' -->
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- GridTrimVertex** -->
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-182'/>
     <!-- Mesher* -->
-    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-184'/>
     <!-- Mesher* const -->
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-184' const='yes' id='type-id-310'/>
     <!-- const float -->
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-181'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Real[2] -->
@@ -8202,7 +8202,7 @@
     <!-- struct O_pwlcurve -->
     <class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- TrimVertex* O_pwlcurve::pts -->
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/reader.h' line='85' column='1'/>
@@ -8225,7 +8225,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- O_curve* O_pwlcurve::owner -->
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_pwlcurve::O_pwlcurve(long int, long int, float*, long int, TrimVertex*) -->
@@ -8250,7 +8250,7 @@
     <!-- struct Property -->
     <class-decl name='Property' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='120' column='1' id='type-id-328'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int Property::type -->
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
@@ -8299,10 +8299,10 @@
     <!-- struct O_curve -->
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-96'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
         <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-165'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
           <data-member access='private'>
             <!-- O_nurbscurve* o_nurbscurve -->
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
@@ -8315,19 +8315,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- union {O_nurbscurve* o_nurbscurve; O_pwlcurve* o_pwlcurve;} O_curve::curve -->
-        <var-decl name='curve' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
+        <var-decl name='curve' type-id='type-id-158' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- Curvetype O_curve::curvetype -->
-        <var-decl name='curvetype' type-id='type-id-166' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
+        <var-decl name='curvetype' type-id='type-id-159' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_curve* O_curve::next -->
-        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
+        <var-decl name='next' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_surface* O_curve::owner -->
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- int O_curve::used -->
@@ -8345,7 +8345,7 @@
         <!-- O_curve::O_curve() -->
         <function-decl name='O_curve' filepath='libnurbs/internals/reader.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_curve*' -->
-          <parameter type-id='type-id-84' is-artificial='yes'/>
+          <parameter type-id='type-id-85' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -8354,14 +8354,14 @@
     <!-- struct O_trim -->
     <class-decl name='O_trim' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='94' column='1' id='type-id-101'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- O_curve* O_trim::o_curve -->
-        <var-decl name='o_curve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
+        <var-decl name='o_curve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_trim::next -->
-        <var-decl name='next' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
+        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_trim::save -->
@@ -8371,7 +8371,7 @@
         <!-- O_trim::O_trim() -->
         <function-decl name='O_trim' filepath='libnurbs/internals/reader.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_trim*' -->
-          <parameter type-id='type-id-83' is-artificial='yes'/>
+          <parameter type-id='type-id-84' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
@@ -8380,14 +8380,14 @@
     <!-- struct O_surface -->
     <class-decl name='O_surface' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='112' column='1' id='type-id-100'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- O_nurbssurface* O_surface::o_nurbssurface -->
         <var-decl name='o_nurbssurface' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- O_trim* O_surface::o_trim -->
-        <var-decl name='o_trim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
+        <var-decl name='o_trim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int O_surface::save -->
@@ -8401,14 +8401,14 @@
         <!-- O_surface::O_surface() -->
         <function-decl name='O_surface' filepath='libnurbs/internals/reader.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'O_surface*' -->
-          <parameter type-id='type-id-82' is-artificial='yes'/>
+          <parameter type-id='type-id-83' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- enum Curvetype -->
-    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-166'>
+    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-159'>
       <underlying-type type-id='type-id-9'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
@@ -8417,10 +8417,10 @@
     <!-- struct O_nurbssurface -->
     <class-decl name='O_nurbssurface' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='101' column='1' id='type-id-138'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Quilt* O_nurbssurface::bezier_patches -->
-        <var-decl name='bezier_patches' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
+        <var-decl name='bezier_patches' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbssurface::type -->
@@ -8428,7 +8428,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- O_surface* O_nurbssurface::owner -->
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- O_nurbssurface* O_nurbssurface::next -->
@@ -8457,10 +8457,10 @@
     <!-- struct O_nurbscurve -->
     <class-decl name='O_nurbscurve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='70' column='1' id='type-id-137'>
       <!-- class PooledObj -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- Quilt* O_nurbscurve::bezier_curves -->
-        <var-decl name='bezier_curves' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
+        <var-decl name='bezier_curves' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- long int O_nurbscurve::type -->
@@ -8488,7 +8488,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- O_curve* O_nurbscurve::owner -->
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <!-- O_nurbscurve::O_nurbscurve(long int) -->
@@ -8503,33 +8503,33 @@
       </member-function>
     </class-decl>
     <!-- NurbsTessellator* const -->
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-330'/>
     <!-- O_curve* -->
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-85'/>
     <!-- O_curve** -->
-    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-79'/>
     <!-- O_nurbscurve* -->
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-97'/>
     <!-- O_nurbscurve** -->
-    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-80'/>
     <!-- O_nurbssurface* -->
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-98'/>
     <!-- O_nurbssurface** -->
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-82'/>
     <!-- O_pwlcurve* -->
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-99'/>
     <!-- O_pwlcurve** -->
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-81'/>
     <!-- O_surface* -->
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-82'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-83'/>
     <!-- O_trim* -->
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-83'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-84'/>
     <!-- O_trim** -->
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-77'/>
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
     <!-- Property* -->
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
     <!-- Renderhints* -->
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-118'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Patchspec[2] -->
@@ -8557,7 +8557,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- REAL Pspec::sidestep[2] -->
-        <var-decl name='sidestep' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
+        <var-decl name='sidestep' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <!-- REAL Pspec::stepsize -->
@@ -8576,7 +8576,7 @@
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-266'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- Mapdesc* Patch::mapdesc -->
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- Patch* Patch::next -->
@@ -8620,7 +8620,7 @@
           <!-- implicit parameter of type 'Patch*' -->
           <parameter type-id='type-id-256' is-artificial='yes'/>
           <!-- parameter of type 'Quilt*' -->
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <!-- parameter of type 'REAL*' -->
           <parameter type-id='type-id-16'/>
           <!-- parameter of type 'REAL*' -->
@@ -8688,11 +8688,11 @@
     <!-- Flist& -->
     <qualified-type-def type-id='type-id-295' id='type-id-335'/>
     <!-- Quilt* const -->
-    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-336'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Renderhints* const -->
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-337'/>
+    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-337'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class rectBlock -->
@@ -8925,11 +8925,11 @@
       </member-function>
     </class-decl>
     <!-- Slicer* -->
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-162'/>
     <!-- Slicer* const -->
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-347'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-347'/>
     <!-- TrimRegion* const -->
-    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-348'/>
+    <qualified-type-def type-id='type-id-205' const='yes' id='type-id-348'/>
     <!-- gridBoundaryChain* -->
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-340'/>
     <!-- gridWrap* -->
@@ -8951,7 +8951,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Sorter* const -->
-    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-202' const='yes' id='type-id-353'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Patchlist& -->
@@ -9124,7 +9124,7 @@
       </member-function>
     </class-decl>
     <!-- typedef Quilt* Quilt_ptr -->
-    <typedef-decl name='Quilt_ptr' type-id='type-id-120' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-362'/>
+    <typedef-decl name='Quilt_ptr' type-id='type-id-125' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-362'/>
     <!-- Breakpt* -->
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-357'/>
     <!-- Knotspec* -->
@@ -9148,7 +9148,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- Uarray* const -->
-    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-368'/>
+    <qualified-type-def type-id='type-id-214' const='yes' id='type-id-368'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- REAL[1000] -->
@@ -9501,14 +9501,14 @@
     <!-- long int[8] -->
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-3' id='type-id-224'/>
+      <subrange length='8' type-id='type-id-3' id='type-id-225'/>
     </array-type-def>
     <!-- unnamed&#45;enum&#45;underlying&#45;type&#45;32 -->
     <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-9'/>
     <!-- unsigned long int -->
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <!-- unsigned long int[16] -->
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-225'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-224'>
       <!-- <anonymous range>[16] -->
       <subrange length='16' type-id='type-id-3' id='type-id-227'/>
     </array-type-def>
@@ -9642,7 +9642,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
         <!-- jmp_buf GLUtesselator::env -->
-        <var-decl name='env' type-id='type-id-163' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
+        <var-decl name='env' type-id='type-id-156' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
         <!-- void* GLUtesselator::polygonData -->
@@ -9980,7 +9980,7 @@
       </data-member>
     </class-decl>
     <!-- typedef __jmp_buf_tag[1] jmp_buf -->
-    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-163'/>
+    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-156'/>
     <!-- typedef long int[8] __jmp_buf -->
     <typedef-decl name='__jmp_buf' type-id='type-id-222' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-215'/>
     <!-- typedef __anonymous_struct__2 __sigset_t -->
@@ -9989,7 +9989,7 @@
     <class-decl name='__anonymous_struct__2' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-223'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int __val[16] -->
-        <var-decl name='__val' type-id='type-id-225' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
+        <var-decl name='__val' type-id='type-id-224' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- ActiveRegion* -->
@@ -10047,7 +10047,7 @@
     <!-- void (void*, void*)* -->
     <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-412'/>
     <!-- void** -->
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-163'/>
     <!-- void gluTessProperty(GLUtesselator*, GLenum, GLdouble) -->
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <!-- parameter of type 'GLUtesselator*' -->
@@ -10213,11 +10213,11 @@
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-462'/>
       <!-- parameter of type 'void**' -->
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'GLfloat*' -->
       <parameter type-id='type-id-61'/>
       <!-- parameter of type 'void**' -->
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <!-- void -->
       <return type-id='type-id-12'/>
     </function-type>
@@ -10226,11 +10226,11 @@
       <!-- parameter of type 'GLdouble*' -->
       <parameter type-id='type-id-462'/>
       <!-- parameter of type 'void**' -->
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'GLfloat*' -->
       <parameter type-id='type-id-61'/>
       <!-- parameter of type 'void**' -->
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-25'/>
       <!-- void -->
@@ -10493,9 +10493,9 @@
     <!-- const GLdouble* -->
     <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-471'/>
     <!-- const GLint -->
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-89'/>
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-90'/>
     <!-- const GLint* -->
-    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-62'/>
     <!-- GLint gluProject(GLdouble, GLdouble, GLdouble, const GLdouble*, const GLdouble*, const GLint*, GLdouble*, GLdouble*, GLdouble*) -->
     <function-decl name='gluProject' mangled-name='gluProject' filepath='libutil/project.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluProject'>
       <!-- parameter of type 'typedef GLdouble' -->
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 62a94355..ac337a41 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -4690,23 +4690,6 @@
         </data-member>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='__sanitizer'>
-      <!-- class __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback> -->
-      <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <!-- __sanitizer::atomic_uintptr_t __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::map1_[2048] -->
-          <var-decl name='map1_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='131072'>
-          <!-- __sanitizer::StaticSpinMutex __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::mu_ -->
-          <var-decl name='mu_' type-id='type-id-119' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='649' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <!-- const __sanitizer::SpinMutex -->
-    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-135'/>
-    <!-- const __sanitizer::uptr -->
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-131'/>
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch> -->
       <class-decl name='IntrusiveList&lt;__sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;::TransferBatch&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-129'>
@@ -4716,11 +4699,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>::first_ -->
-          <var-decl name='first_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+          <var-decl name='first_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>::last_ -->
-          <var-decl name='last_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+          <var-decl name='last_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -4729,11 +4712,11 @@
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-127'>
         <member-type access='public'>
           <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::Batch -->
-          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-142'/>
+          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-141'/>
         </member-type>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass -->
-          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-143'>
+          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass::count -->
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
@@ -4744,7 +4727,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass::batch[128] -->
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -4754,7 +4737,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::per_class_[53] -->
-          <var-decl name='per_class_' type-id='type-id-145' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='440960'>
           <!-- __sanitizer::AllocatorStats __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::stats_ -->
@@ -4763,13 +4746,13 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-146'>
+      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-145'>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch -->
           <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-125'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::next -->
-              <var-decl name='next' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::count -->
@@ -4777,12 +4760,25 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::batch[64] -->
-              <var-decl name='batch' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-146' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <!-- class __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback> -->
+      <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <!-- __sanitizer::atomic_uintptr_t __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::map1_[2048] -->
+          <var-decl name='map1_' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='131072'>
+          <!-- __sanitizer::StaticSpinMutex __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::mu_ -->
+          <var-decl name='mu_' type-id='type-id-119' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='649' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::atomic_uint8_t -->
       <class-decl name='atomic_uint8_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='28' column='1' id='type-id-134'>
@@ -4796,22 +4792,26 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <!-- const __sanitizer::SpinMutex -->
+    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-135'/>
+    <!-- const __sanitizer::uptr -->
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-131'/>
+    <!-- __sanitizer::AllocatorStats* -->
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-138'/>
     <!-- PerClass[53] -->
-    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='440960' id='type-id-145'>
+    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='440960' id='type-id-144'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
-    <!-- __sanitizer::AllocatorStats* -->
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-138'/>
     <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* -->
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-141'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-140'/>
     <!-- atomic_uint64_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-151' size-in-bits='256' id='type-id-139'>
       <!-- <anonymous range>[4] -->
       <subrange length='4' type-id='type-id-50' id='type-id-152'/>
     </array-type-def>
     <!-- atomic_uintptr_t[2048] -->
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-140'>
+    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-147'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-50' id='type-id-154'/>
     </array-type-def>
@@ -4820,12 +4820,12 @@
       <typedef-decl name='u8' type-id='type-id-17' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='66' column='1' id='type-id-149'/>
     </namespace-decl>
     <!-- void*[128] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-144'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-143'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
     <!-- void*[64] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-147'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-146'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
@@ -5685,8 +5685,6 @@
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-239'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression>& -->
     <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-241'/>
-    <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::Suppression -->
       <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-243'>
@@ -5708,6 +5706,8 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression> -->
+    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
     <namespace-decl name='__sanitizer'>
       <!-- enum __sanitizer::SuppressionType -->
       <enum-decl name='SuppressionType' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='19' column='1' id='type-id-245'>
@@ -6164,6 +6164,15 @@
         <return type-id='type-id-287'/>
       </function-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <!-- struct __sanitizer::__sanitizer_kernel_sigset_t -->
+      <class-decl name='__sanitizer_kernel_sigset_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='419' column='1' id='type-id-282'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- unsigned char __sanitizer::__sanitizer_kernel_sigset_t::sig[8] -->
+          <var-decl name='sig' type-id='type-id-289' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='420' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <!-- enum __sanitizer::memory_order -->
       <enum-decl name='memory_order' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='19' column='1' id='type-id-288'>
@@ -6196,15 +6205,6 @@
       <!-- void -->
       <return type-id='type-id-4'/>
     </function-type>
-    <namespace-decl name='__sanitizer'>
-      <!-- struct __sanitizer::__sanitizer_kernel_sigset_t -->
-      <class-decl name='__sanitizer_kernel_sigset_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='419' column='1' id='type-id-282'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- unsigned char __sanitizer::__sanitizer_kernel_sigset_t::sig[8] -->
-          <var-decl name='sig' type-id='type-id-289' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='420' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <!-- typedef uint64_t Elf64_Addr -->
     <typedef-decl name='Elf64_Addr' type-id='type-id-290' filepath='/usr/include/elf.h' line='50' column='1' id='type-id-249'/>
     <!-- typedef uint64_t Elf64_Xword -->
@@ -6383,6 +6383,8 @@
       <!-- int -->
       <return type-id='type-id-25'/>
     </function-decl>
+    <!-- struct _Unwind_Context -->
+    <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
     <!-- bool (const char*) -->
     <function-type size-in-bits='64' id='type-id-306'>
       <!-- parameter of type 'const char*' -->
@@ -6390,8 +6392,6 @@
       <!-- bool -->
       <return type-id='type-id-112'/>
     </function-type>
-    <!-- struct _Unwind_Context -->
-    <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-312'/>
   </abi-instr>
@@ -8349,8 +8349,6 @@
     <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-404'/>
     <!-- const __sanitizer::Symbolizer* -->
     <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-403'/>
-    <!-- const __sanitizer::Symbolizer -->
-    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-411'/>
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::AddressInfo -->
       <class-decl name='AddressInfo' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='26' column='1' id='type-id-409'>
@@ -8422,6 +8420,8 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <!-- const __sanitizer::Symbolizer -->
+    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-411'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
@@ -8830,6 +8830,23 @@
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-432'/>
     <!-- const __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>* -->
     <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-434'/>
+    <namespace-decl name='__sanitizer'>
+      <!-- struct __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase> -->
+      <class-decl name='IntrusiveList&lt;__sanitizer::ThreadContextBase&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-436'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- __sanitizer::uptr __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::size_ -->
+          <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- __sanitizer::ThreadContextBase* __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::first_ -->
+          <var-decl name='first_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- __sanitizer::ThreadContextBase* __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::last_ -->
+          <var-decl name='last_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::ThreadContextBase -->
       <class-decl name='ThreadContextBase' size-in-bits='1024' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='32' column='1' id='type-id-437'>
@@ -8981,23 +8998,6 @@
     </namespace-decl>
     <!-- const __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase> -->
     <qualified-type-def type-id='type-id-436' const='yes' id='type-id-438'/>
-    <namespace-decl name='__sanitizer'>
-      <!-- struct __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase> -->
-      <class-decl name='IntrusiveList&lt;__sanitizer::ThreadContextBase&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-436'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- __sanitizer::uptr __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::size_ -->
-          <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- __sanitizer::ThreadContextBase* __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::first_ -->
-          <var-decl name='first_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- __sanitizer::ThreadContextBase* __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>::last_ -->
-          <var-decl name='last_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <!-- char[64] -->
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='512' id='type-id-440'>
       <!-- <anonymous range>[64] -->
@@ -9718,11 +9718,6 @@
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > __tsan::AllocatorCache -->
       <typedef-decl name='AllocatorCache' type-id='type-id-501' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='133' column='1' id='type-id-476'/>
     </namespace-decl>
-    <!-- Desc[16] -->
-    <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
-      <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
-    </array-type-def>
     <!-- __tsan::DeadlockDetector* -->
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-488'/>
     <!-- __tsan::FastState* -->
@@ -9730,11 +9725,154 @@
     <!-- __tsan::IgnoreSet* -->
     <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-492'/>
     <!-- __tsan::JmpBuf* -->
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-496'/>
     <!-- __tsan::MutexSet* -->
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-495'/>
+    <!-- Desc[16] -->
+    <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
+      <!-- <anonymous range>[16] -->
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
+    </array-type-def>
     <!-- __tsan::Vector<__tsan::JmpBuf>* -->
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-497'/>
+    <namespace-decl name='__sanitizer'>
+      <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > -->
+      <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
+        <member-type access='public'>
+          <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass -->
+          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-504'>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::count -->
+              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='64'>
+              <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::max_count -->
+              <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='128'>
+              <!-- void* __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::batch[256] -->
+              <var-decl name='batch' type-id='type-id-505' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+            </data-member>
+          </class-decl>
+        </member-type>
+        <member-type access='public'>
+          <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::Batch -->
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-506'/>
+        </member-type>
+        <data-member access='public' static='yes'>
+          <!-- static const __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::kNumClasses -->
+          <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::per_class_[53] -->
+          <var-decl name='per_class_' type-id='type-id-508' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='875136'>
+          <!-- __sanitizer::AllocatorStats __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::stats_ -->
+          <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <!-- struct __tsan::Context -->
+      <class-decl name='Context' size-in-bits='549632' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='526' column='1' id='type-id-484'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- bool __tsan::Context::initialized -->
+          <var-decl name='initialized' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='529' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- __tsan::SyncTab __tsan::Context::synctab -->
+          <var-decl name='synctab' type-id='type-id-509' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516736'>
+          <!-- __tsan::Mutex __tsan::Context::report_mtx -->
+          <var-decl name='report_mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516800'>
+          <!-- int __tsan::Context::nreported -->
+          <var-decl name='nreported' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516832'>
+          <!-- int __tsan::Context::nmissed_expected -->
+          <var-decl name='nmissed_expected' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516864'>
+          <!-- __sanitizer::atomic_uint64_t __tsan::Context::last_symbolize_time_ns -->
+          <var-decl name='last_symbolize_time_ns' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516928'>
+          <!-- __sanitizer::ThreadRegistry* __tsan::Context::thread_registry -->
+          <var-decl name='thread_registry' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516992'>
+          <!-- __tsan::Vector<__tsan::RacyStacks> __tsan::Context::racy_stacks -->
+          <var-decl name='racy_stacks' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517248'>
+          <!-- __tsan::Vector<__tsan::RacyAddress> __tsan::Context::racy_addresses -->
+          <var-decl name='racy_addresses' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517504'>
+          <!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression> __tsan::Context::fired_suppressions -->
+          <var-decl name='fired_suppressions' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517696'>
+          <!-- __tsan::Flags __tsan::Context::flags -->
+          <var-decl name='flags' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='518656'>
+          <!-- long long unsigned int __tsan::Context::stat[438] -->
+          <var-decl name='stat' type-id='type-id-479' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='547' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='546688'>
+          <!-- long long unsigned int __tsan::Context::int_alloc_cnt[23] -->
+          <var-decl name='int_alloc_cnt' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='548160'>
+          <!-- long long unsigned int __tsan::Context::int_alloc_siz[23] -->
+          <var-decl name='int_alloc_siz' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
+        </data-member>
+        <member-function access='public' constructor='yes'>
+          <!-- __tsan::Context::Context() -->
+          <function-decl name='Context' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__tsan::Context*' -->
+            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' constructor='yes'>
+          <!-- __tsan::Context::Context() -->
+          <function-decl name='Context' mangled-name='_ZN6__tsan7ContextC2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__tsan::Context*' -->
+            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <!-- struct __tsan::SignalContext -->
+      <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-485'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- int __tsan::SignalContext::in_blocking_func -->
+          <var-decl name='in_blocking_func' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='32'>
+          <!-- int __tsan::SignalContext::int_signal_send -->
+          <var-decl name='int_signal_send' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- int __tsan::SignalContext::pending_signal_count -->
+          <var-decl name='pending_signal_count' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- __tsan::SignalDesc __tsan::SignalContext::pending_signals[64] -->
+          <var-decl name='pending_signals' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- class __tsan::ThreadContext -->
       <class-decl name='ThreadContext' size-in-bits='1536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='478' column='1' id='type-id-486'>
@@ -9869,170 +10007,32 @@
     <!-- const __sanitizer::u64 -->
     <qualified-type-def type-id='type-id-157' const='yes' id='type-id-489'/>
     <!-- const __tsan::Vector<__tsan::JmpBuf>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-498'/>
     <!-- long long unsigned int[11] -->
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='704' id='type-id-487'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-50' id='type-id-505'/>
+      <subrange length='11' type-id='type-id-50' id='type-id-519'/>
+    </array-type-def>
+    <!-- unsigned int[16] -->
+    <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='512' id='type-id-491'>
+      <!-- <anonymous range>[16] -->
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
+    </array-type-def>
+    <!-- PerClass[53] -->
+    <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='875136' id='type-id-508'>
+      <!-- <anonymous range>[53] -->
+      <subrange length='53' type-id='type-id-50' id='type-id-136'/>
+    </array-type-def>
+    <!-- __sanitizer::ThreadRegistry* -->
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-511'/>
+    <!-- SignalDesc[64] -->
+    <array-type-def dimensions='1' type-id='type-id-521' size-in-bits='552960' id='type-id-517'>
+      <!-- <anonymous range>[64] -->
+      <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
-    <namespace-decl name='__sanitizer'>
-      <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > -->
-      <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
-        <member-type access='public'>
-          <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass -->
-          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-506'>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::count -->
-              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='64'>
-              <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::max_count -->
-              <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void* __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::batch[256] -->
-              <var-decl name='batch' type-id='type-id-507' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
-            </data-member>
-          </class-decl>
-        </member-type>
-        <member-type access='public'>
-          <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::Batch -->
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-508'/>
-        </member-type>
-        <data-member access='public' static='yes'>
-          <!-- static const __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::kNumClasses -->
-          <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::per_class_[53] -->
-          <var-decl name='per_class_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='875136'>
-          <!-- __sanitizer::AllocatorStats __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::stats_ -->
-          <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- struct __tsan::Context -->
-      <class-decl name='Context' size-in-bits='549632' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='526' column='1' id='type-id-484'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- bool __tsan::Context::initialized -->
-          <var-decl name='initialized' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='529' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- __tsan::SyncTab __tsan::Context::synctab -->
-          <var-decl name='synctab' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516736'>
-          <!-- __tsan::Mutex __tsan::Context::report_mtx -->
-          <var-decl name='report_mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516800'>
-          <!-- int __tsan::Context::nreported -->
-          <var-decl name='nreported' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516832'>
-          <!-- int __tsan::Context::nmissed_expected -->
-          <var-decl name='nmissed_expected' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516864'>
-          <!-- __sanitizer::atomic_uint64_t __tsan::Context::last_symbolize_time_ns -->
-          <var-decl name='last_symbolize_time_ns' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516928'>
-          <!-- __sanitizer::ThreadRegistry* __tsan::Context::thread_registry -->
-          <var-decl name='thread_registry' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516992'>
-          <!-- __tsan::Vector<__tsan::RacyStacks> __tsan::Context::racy_stacks -->
-          <var-decl name='racy_stacks' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517248'>
-          <!-- __tsan::Vector<__tsan::RacyAddress> __tsan::Context::racy_addresses -->
-          <var-decl name='racy_addresses' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517504'>
-          <!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression> __tsan::Context::fired_suppressions -->
-          <var-decl name='fired_suppressions' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517696'>
-          <!-- __tsan::Flags __tsan::Context::flags -->
-          <var-decl name='flags' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='518656'>
-          <!-- long long unsigned int __tsan::Context::stat[438] -->
-          <var-decl name='stat' type-id='type-id-479' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='547' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='546688'>
-          <!-- long long unsigned int __tsan::Context::int_alloc_cnt[23] -->
-          <var-decl name='int_alloc_cnt' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='548160'>
-          <!-- long long unsigned int __tsan::Context::int_alloc_siz[23] -->
-          <var-decl name='int_alloc_siz' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
-        </data-member>
-        <member-function access='public' constructor='yes'>
-          <!-- __tsan::Context::Context() -->
-          <function-decl name='Context' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__tsan::Context*' -->
-            <parameter type-id='type-id-483' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' constructor='yes'>
-          <!-- __tsan::Context::Context() -->
-          <function-decl name='Context' mangled-name='_ZN6__tsan7ContextC2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__tsan::Context*' -->
-            <parameter type-id='type-id-483' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- struct __tsan::SignalContext -->
-      <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-485'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- int __tsan::SignalContext::in_blocking_func -->
-          <var-decl name='in_blocking_func' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='32'>
-          <!-- int __tsan::SignalContext::int_signal_send -->
-          <var-decl name='int_signal_send' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- int __tsan::SignalContext::pending_signal_count -->
-          <var-decl name='pending_signal_count' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- __tsan::SignalDesc __tsan::SignalContext::pending_signals[64] -->
-          <var-decl name='pending_signals' type-id='type-id-519' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <!-- unsigned int[16] -->
-    <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='512' id='type-id-491'>
-      <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
-    </array-type-def>
-    <!-- PerClass[53] -->
-    <array-type-def dimensions='1' type-id='type-id-506' size-in-bits='875136' id='type-id-510'>
-      <!-- <anonymous range>[53] -->
-      <subrange length='53' type-id='type-id-50' id='type-id-136'/>
-    </array-type-def>
-    <!-- SignalDesc[64] -->
-    <array-type-def dimensions='1' type-id='type-id-520' size-in-bits='552960' id='type-id-519'>
-      <!-- <anonymous range>[64] -->
-      <subrange length='64' type-id='type-id-50' id='type-id-122'/>
-    </array-type-def>
-    <!-- __sanitizer::ThreadRegistry* -->
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-513'/>
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<__tsan::FiredSuppression> -->
-      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-516'>
+      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-514'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::FiredSuppression* __sanitizer::InternalMmapVector<__tsan::FiredSuppression>::data_ -->
           <var-decl name='data_' type-id='type-id-522' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
@@ -10080,9 +10080,150 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-525'>
+        <member-type access='public'>
+          <!-- struct __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch -->
+          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-507'>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <!-- __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::next -->
+              <var-decl name='next' type-id='type-id-526' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='64'>
+              <!-- __sanitizer::uptr __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::count -->
+              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='128'>
+              <!-- void* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::batch[128] -->
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+            </data-member>
+          </class-decl>
+        </member-type>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <!-- struct __tsan::Flags -->
+      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-515'>
+        <!-- struct __sanitizer::CommonFlags -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-527'/>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <!-- bool __tsan::Flags::enable_annotations -->
+          <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='392'>
+          <!-- bool __tsan::Flags::suppress_equal_stacks -->
+          <var-decl name='suppress_equal_stacks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='30' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='400'>
+          <!-- bool __tsan::Flags::suppress_equal_addresses -->
+          <var-decl name='suppress_equal_addresses' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='33' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='408'>
+          <!-- bool __tsan::Flags::suppress_java -->
+          <var-decl name='suppress_java' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='36' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='416'>
+          <!-- bool __tsan::Flags::report_bugs -->
+          <var-decl name='report_bugs' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='38' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='424'>
+          <!-- bool __tsan::Flags::report_thread_leaks -->
+          <var-decl name='report_thread_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='40' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='432'>
+          <!-- bool __tsan::Flags::report_destroy_locked -->
+          <var-decl name='report_destroy_locked' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='42' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='440'>
+          <!-- bool __tsan::Flags::report_signal_unsafe -->
+          <var-decl name='report_signal_unsafe' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='45' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <!-- bool __tsan::Flags::report_atomic_races -->
+          <var-decl name='report_atomic_races' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='47' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='456'>
+          <!-- bool __tsan::Flags::force_seq_cst_atomics -->
+          <var-decl name='force_seq_cst_atomics' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='50' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <!-- const char* __tsan::Flags::suppressions -->
+          <var-decl name='suppressions' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='52' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='576'>
+          <!-- bool __tsan::Flags::print_suppressions -->
+          <var-decl name='print_suppressions' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='54' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='584'>
+          <!-- bool __tsan::Flags::print_benign -->
+          <var-decl name='print_benign' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='608'>
+          <!-- int __tsan::Flags::exitcode -->
+          <var-decl name='exitcode' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='58' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='640'>
+          <!-- bool __tsan::Flags::halt_on_error -->
+          <var-decl name='halt_on_error' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='672'>
+          <!-- int __tsan::Flags::atexit_sleep_ms -->
+          <var-decl name='atexit_sleep_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='63' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='704'>
+          <!-- const char* __tsan::Flags::profile_memory -->
+          <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='768'>
+          <!-- int __tsan::Flags::flush_memory_ms -->
+          <var-decl name='flush_memory_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='67' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='800'>
+          <!-- int __tsan::Flags::flush_symbolizer_ms -->
+          <var-decl name='flush_symbolizer_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='69' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='832'>
+          <!-- int __tsan::Flags::memory_limit_mb -->
+          <var-decl name='memory_limit_mb' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='72' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='864'>
+          <!-- bool __tsan::Flags::stop_on_start -->
+          <var-decl name='stop_on_start' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='872'>
+          <!-- bool __tsan::Flags::running_on_valgrind -->
+          <var-decl name='running_on_valgrind' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='896'>
+          <!-- int __tsan::Flags::history_size -->
+          <var-decl name='history_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='82' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='928'>
+          <!-- int __tsan::Flags::io_sync -->
+          <var-decl name='io_sync' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='87' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <!-- struct __tsan::JmpBuf -->
+      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-502'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- __sanitizer::uptr __tsan::JmpBuf::sp -->
+          <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- __sanitizer::uptr __tsan::JmpBuf::mangled_sp -->
+          <var-decl name='mangled_sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='392' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- __sanitizer::uptr* __tsan::JmpBuf::shadow_stack_pos -->
+          <var-decl name='shadow_stack_pos' type-id='type-id-472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='393' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- class __tsan::Mutex -->
-      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-512'>
+      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-510'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::atomic_uintptr_t __tsan::Mutex::state_ -->
           <var-decl name='state_' type-id='type-id-153' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='51' column='1'/>
@@ -10091,11 +10232,11 @@
           <!-- __tsan::Mutex::Mutex(__tsan::MutexType, __tsan::StatType) -->
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MutexType' -->
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-529'/>
             <!-- parameter of type 'enum __tsan::StatType' -->
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-530'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10104,7 +10245,7 @@
           <!-- __tsan::Mutex::~Mutex(int) -->
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -10115,9 +10256,9 @@
           <!-- __tsan::Mutex::Mutex(const __tsan::Mutex&) -->
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::Mutex&' -->
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-531'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10126,11 +10267,11 @@
           <!-- __tsan::Mutex::Mutex(__tsan::MutexType, __tsan::StatType) -->
           <function-decl name='Mutex' mangled-name='_ZN6__tsan5MutexC2ENS_9MutexTypeENS_8StatTypeE' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MutexType' -->
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-529'/>
             <!-- parameter of type 'enum __tsan::StatType' -->
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-530'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10139,7 +10280,7 @@
           <!-- __tsan::Mutex::~Mutex(int) -->
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -10150,27 +10291,27 @@
     </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- class __tsan::SyncTab -->
-      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-511'>
+      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-509'>
         <member-type access='private'>
           <!-- struct __tsan::SyncTab::Part -->
-          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-529'>
+          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-532'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __tsan::Mutex __tsan::SyncTab::Part::mtx -->
-              <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
+              <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- __tsan::SyncVar* __tsan::SyncTab::Part::val -->
-              <var-decl name='val' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
+              <var-decl name='val' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- char __tsan::SyncTab::Part::pad[48] -->
-              <var-decl name='pad' type-id='type-id-531' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
+              <var-decl name='pad' type-id='type-id-534' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- __tsan::SyncTab::Part::Part() -->
               <function-decl name='Part' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type '__tsan::SyncTab::Part*' -->
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-4'/>
               </function-decl>
@@ -10179,7 +10320,7 @@
               <!-- __tsan::SyncTab::Part::Part() -->
               <function-decl name='Part' mangled-name='_ZN6__tsan7SyncTab4PartC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type '__tsan::SyncTab::Part*' -->
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-4'/>
               </function-decl>
@@ -10192,7 +10333,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::SyncTab::Part __tsan::SyncTab::tab_[1009] -->
-          <var-decl name='tab_' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
+          <var-decl name='tab_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='516608'>
           <!-- __sanitizer::atomic_uint64_t __tsan::SyncTab::uid_gen_ -->
@@ -10202,7 +10343,7 @@
           <!-- __tsan::SyncTab::SyncTab() -->
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10211,7 +10352,7 @@
           <!-- __tsan::SyncTab::~SyncTab(int) -->
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -10222,9 +10363,9 @@
           <!-- __tsan::SyncTab::SyncTab(const __tsan::SyncTab&) -->
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::SyncTab&' -->
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-538'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10233,7 +10374,7 @@
           <!-- __tsan::SyncTab::SyncTab() -->
           <function-decl name='SyncTab' mangled-name='_ZN6__tsan7SyncTabC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -10242,7 +10383,7 @@
           <!-- __tsan::SyncTab::~SyncTab(int) -->
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -10253,28 +10394,28 @@
     </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- class __tsan::Vector<__tsan::RacyAddress> -->
-      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-515'>
+      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-513'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- const __tsan::MBlockType __tsan::Vector<__tsan::RacyAddress>::typ_ -->
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::begin_ -->
-          <var-decl name='begin_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::end_ -->
-          <var-decl name='end_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::last_ -->
-          <var-decl name='last_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __tsan::Vector<__tsan::RacyAddress>::Vector(__tsan::MBlockType) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MBlockType' -->
             <parameter type-id='type-id-451'/>
             <!-- void -->
@@ -10285,7 +10426,7 @@
           <!-- __tsan::Vector<__tsan::RacyAddress>::~Vector(int) -->
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -10296,62 +10437,8 @@
           <!-- void __tsan::Vector<__tsan::RacyAddress>::Vector(const __tsan::Vector<__tsan::RacyAddress>&) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
-            <!-- parameter of type 'const __tsan::Vector<__tsan::RacyAddress>&' -->
-            <parameter type-id='type-id-538'/>
-            <!-- void -->
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- class __tsan::Vector<__tsan::RacyStacks> -->
-      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-514'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <!-- const __tsan::MBlockType __tsan::Vector<__tsan::RacyStacks>::typ_ -->
-          <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='64'>
-          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::begin_ -->
-          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='128'>
-          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::end_ -->
-          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='192'>
-          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::last_ -->
-          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(__tsan::MBlockType) -->
-          <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
             <parameter type-id='type-id-540' is-artificial='yes'/>
-            <!-- parameter of type 'enum __tsan::MBlockType' -->
-            <parameter type-id='type-id-451'/>
-            <!-- void -->
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' destructor='yes'>
-          <!-- __tsan::Vector<__tsan::RacyStacks>::~Vector(int) -->
-          <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <!-- artificial parameter of type 'int' -->
-            <parameter type-id='type-id-25' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(const __tsan::Vector<__tsan::RacyStacks>&) -->
-          <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <!-- parameter of type 'const __tsan::Vector<__tsan::RacyStacks>&' -->
+            <!-- parameter of type 'const __tsan::Vector<__tsan::RacyAddress>&' -->
             <parameter type-id='type-id-541'/>
             <!-- void -->
             <return type-id='type-id-4'/>
@@ -10359,194 +10446,164 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const __tsan::Vector<__tsan::JmpBuf> -->
-    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-504'/>
-    <!-- long long unsigned int[23] -->
-    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-518'>
-      <!-- <anonymous range>[23] -->
-      <subrange length='23' type-id='type-id-50' id='type-id-542'/>
-    </array-type-def>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-543'>
-        <member-type access='public'>
-          <!-- struct __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch -->
-          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-509'>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <!-- __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::next -->
-              <var-decl name='next' type-id='type-id-544' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='64'>
-              <!-- __sanitizer::uptr __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::count -->
-              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::batch[128] -->
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
-            </data-member>
-          </class-decl>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- struct __tsan::Flags -->
-      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-517'>
-        <!-- struct __sanitizer::CommonFlags -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-545'/>
-        <data-member access='public' layout-offset-in-bits='384'>
-          <!-- bool __tsan::Flags::enable_annotations -->
-          <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='392'>
-          <!-- bool __tsan::Flags::suppress_equal_stacks -->
-          <var-decl name='suppress_equal_stacks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='30' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='400'>
-          <!-- bool __tsan::Flags::suppress_equal_addresses -->
-          <var-decl name='suppress_equal_addresses' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='33' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='408'>
-          <!-- bool __tsan::Flags::suppress_java -->
-          <var-decl name='suppress_java' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='36' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='416'>
-          <!-- bool __tsan::Flags::report_bugs -->
-          <var-decl name='report_bugs' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='38' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='424'>
-          <!-- bool __tsan::Flags::report_thread_leaks -->
-          <var-decl name='report_thread_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='40' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='432'>
-          <!-- bool __tsan::Flags::report_destroy_locked -->
-          <var-decl name='report_destroy_locked' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='42' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='440'>
-          <!-- bool __tsan::Flags::report_signal_unsafe -->
-          <var-decl name='report_signal_unsafe' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='45' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='448'>
-          <!-- bool __tsan::Flags::report_atomic_races -->
-          <var-decl name='report_atomic_races' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='47' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='456'>
-          <!-- bool __tsan::Flags::force_seq_cst_atomics -->
-          <var-decl name='force_seq_cst_atomics' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='50' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='512'>
-          <!-- const char* __tsan::Flags::suppressions -->
-          <var-decl name='suppressions' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='52' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='576'>
-          <!-- bool __tsan::Flags::print_suppressions -->
-          <var-decl name='print_suppressions' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='54' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='584'>
-          <!-- bool __tsan::Flags::print_benign -->
-          <var-decl name='print_benign' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='608'>
-          <!-- int __tsan::Flags::exitcode -->
-          <var-decl name='exitcode' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='58' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='640'>
-          <!-- bool __tsan::Flags::halt_on_error -->
-          <var-decl name='halt_on_error' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='672'>
-          <!-- int __tsan::Flags::atexit_sleep_ms -->
-          <var-decl name='atexit_sleep_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='63' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='704'>
-          <!-- const char* __tsan::Flags::profile_memory -->
-          <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='768'>
-          <!-- int __tsan::Flags::flush_memory_ms -->
-          <var-decl name='flush_memory_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='67' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='800'>
-          <!-- int __tsan::Flags::flush_symbolizer_ms -->
-          <var-decl name='flush_symbolizer_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='69' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='832'>
-          <!-- int __tsan::Flags::memory_limit_mb -->
-          <var-decl name='memory_limit_mb' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='72' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='864'>
-          <!-- bool __tsan::Flags::stop_on_start -->
-          <var-decl name='stop_on_start' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='872'>
-          <!-- bool __tsan::Flags::running_on_valgrind -->
-          <var-decl name='running_on_valgrind' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='896'>
-          <!-- int __tsan::Flags::history_size -->
-          <var-decl name='history_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='82' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='928'>
-          <!-- int __tsan::Flags::io_sync -->
-          <var-decl name='io_sync' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='87' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- struct __tsan::JmpBuf -->
-      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-503'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- __sanitizer::uptr __tsan::JmpBuf::sp -->
-          <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
+    <namespace-decl name='__tsan'>
+      <!-- class __tsan::Vector<__tsan::RacyStacks> -->
+      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-512'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <!-- const __tsan::MBlockType __tsan::Vector<__tsan::RacyStacks>::typ_ -->
+          <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- __sanitizer::uptr __tsan::JmpBuf::mangled_sp -->
-          <var-decl name='mangled_sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='392' column='1'/>
+        <data-member access='private' layout-offset-in-bits='64'>
+          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::begin_ -->
+          <var-decl name='begin_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- __sanitizer::uptr* __tsan::JmpBuf::shadow_stack_pos -->
-          <var-decl name='shadow_stack_pos' type-id='type-id-472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='393' column='1'/>
+        <data-member access='private' layout-offset-in-bits='128'>
+          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::end_ -->
+          <var-decl name='end_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='192'>
+          <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::last_ -->
+          <var-decl name='last_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
+        <member-function access='public'>
+          <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(__tsan::MBlockType) -->
+          <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <!-- parameter of type 'enum __tsan::MBlockType' -->
+            <parameter type-id='type-id-451'/>
+            <!-- void -->
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' destructor='yes'>
+          <!-- __tsan::Vector<__tsan::RacyStacks>::~Vector(int) -->
+          <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <!-- artificial parameter of type 'int' -->
+            <parameter type-id='type-id-25' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(const __tsan::Vector<__tsan::RacyStacks>&) -->
+          <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <!-- parameter of type 'const __tsan::Vector<__tsan::RacyStacks>&' -->
+            <parameter type-id='type-id-544'/>
+            <!-- void -->
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- const __tsan::Vector<__tsan::JmpBuf> -->
+    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-518'/>
+    <!-- long long unsigned int[23] -->
+    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-516'>
+      <!-- <anonymous range>[23] -->
+      <subrange length='23' type-id='type-id-50' id='type-id-545'/>
+    </array-type-def>
     <!-- void*[256] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-507'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-505'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-50' id='type-id-194'/>
     </array-type-def>
-    <!-- Part[1009] -->
-    <array-type-def dimensions='1' type-id='type-id-529' size-in-bits='516608' id='type-id-533'>
-      <!-- <anonymous range>[1009] -->
-      <subrange length='1009' type-id='type-id-50' id='type-id-546'/>
-    </array-type-def>
     <!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression>* -->
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-523'/>
     <!-- __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch* -->
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-526'/>
     <!-- __tsan::FiredSuppression* -->
-    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-522'/>
     <!-- __tsan::Mutex* -->
-    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-528'/>
     <!-- __tsan::RacyAddress* -->
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-539'/>
     <!-- __tsan::RacyStacks* -->
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-542'/>
     <!-- __tsan::SyncTab* -->
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-537'/>
     <!-- __tsan::SyncTab::Part* -->
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-535'/>
+    <!-- Part[1009] -->
+    <array-type-def dimensions='1' type-id='type-id-532' size-in-bits='516608' id='type-id-536'>
+      <!-- <anonymous range>[1009] -->
+      <subrange length='1009' type-id='type-id-50' id='type-id-549'/>
+    </array-type-def>
     <!-- __tsan::SyncVar* -->
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-533'/>
     <!-- __tsan::Vector<__tsan::RacyAddress>* -->
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-540'/>
     <!-- __tsan::Vector<__tsan::RacyStacks>* -->
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-543'/>
     <!-- char[48] -->
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-531'>
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-534'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-50' id='type-id-551'/>
     </array-type-def>
+    <namespace-decl name='__sanitizer'>
+      <!-- struct __sanitizer::CommonFlags -->
+      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-527'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- bool __sanitizer::CommonFlags::symbolize -->
+          <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- const char* __sanitizer::CommonFlags::external_symbolizer_path -->
+          <var-decl name='external_symbolizer_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='28' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- const char* __sanitizer::CommonFlags::strip_path_prefix -->
+          <var-decl name='strip_path_prefix' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='30' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <!-- bool __sanitizer::CommonFlags::fast_unwind_on_fatal -->
+          <var-decl name='fast_unwind_on_fatal' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='32' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='200'>
+          <!-- bool __sanitizer::CommonFlags::fast_unwind_on_malloc -->
+          <var-decl name='fast_unwind_on_malloc' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='34' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='208'>
+          <!-- bool __sanitizer::CommonFlags::handle_ioctl -->
+          <var-decl name='handle_ioctl' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='224'>
+          <!-- int __sanitizer::CommonFlags::malloc_context_size -->
+          <var-decl name='malloc_context_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='38' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <!-- const char* __sanitizer::CommonFlags::log_path -->
+          <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <!-- int __sanitizer::CommonFlags::verbosity -->
+          <var-decl name='verbosity' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='44' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='352'>
+          <!-- bool __sanitizer::CommonFlags::detect_leaks -->
+          <var-decl name='detect_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='360'>
+          <!-- bool __sanitizer::CommonFlags::leak_check_at_exit -->
+          <var-decl name='leak_check_at_exit' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='50' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='368'>
+          <!-- bool __sanitizer::CommonFlags::allocator_may_return_null -->
+          <var-decl name='allocator_may_return_null' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='52' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='376'>
+          <!-- bool __sanitizer::CommonFlags::print_summary -->
+          <var-decl name='print_summary' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='54' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::ThreadRegistry -->
-      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-521'>
+      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-520'>
         <member-type access='public'>
           <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
           <typedef-decl name='ThreadCallback' type-id='type-id-553' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-552'/>
@@ -10611,7 +10668,7 @@
           <!-- __sanitizer::ThreadRegistry::ThreadRegistry(__sanitizer::ThreadContextFactory, __sanitizer::u32, __sanitizer::u32) -->
           <function-decl name='ThreadRegistry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::ThreadRegistry*' -->
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::ThreadContextFactory' -->
             <parameter type-id='type-id-558'/>
             <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -10626,7 +10683,7 @@
           <!-- __sanitizer::ThreadRegistry::ThreadRegistry(__sanitizer::ThreadContextFactory, __sanitizer::u32, __sanitizer::u32) -->
           <function-decl name='ThreadRegistry' mangled-name='_ZN11__sanitizer14ThreadRegistryC2EPFPNS_17ThreadContextBaseEjEjj' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::ThreadRegistry*' -->
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::ThreadContextFactory' -->
             <parameter type-id='type-id-558'/>
             <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -10639,19 +10696,40 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <!-- struct __tsan::SignalDesc -->
+      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-521'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- bool __tsan::SignalDesc::armed -->
+          <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='8'>
+          <!-- bool __tsan::SignalDesc::sigaction -->
+          <var-decl name='sigaction' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='116' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- my_siginfo_t __tsan::SignalDesc::siginfo -->
+          <var-decl name='siginfo' type-id='type-id-559' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1088'>
+          <!-- ucontext_t __tsan::SignalDesc::ctx -->
+          <var-decl name='ctx' type-id='type-id-560' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-524'/>
+    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-524'/>
     <!-- const __tsan::Mutex& -->
-    <reference-type-def kind='lvalue' type-id='type-id-560' size-in-bits='64' id='type-id-528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-531'/>
     <!-- const __tsan::SyncTab& -->
-    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-538'/>
     <!-- const __tsan::Vector<__tsan::RacyAddress>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-541'/>
     <!-- const __tsan::Vector<__tsan::RacyStacks>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-544'/>
     <namespace-decl name='__tsan'>
       <!-- enum __tsan::MutexType -->
-      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-526'>
+      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-529'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='MutexTypeInvalid' value='0'/>
         <enumerator name='MutexTypeTrace' value='1'/>
@@ -10669,7 +10747,7 @@
     </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- enum __tsan::StatType -->
-      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-527'>
+      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-530'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='StatMop' value='0'/>
         <enumerator name='StatMopRead' value='1'/>
@@ -11112,103 +11190,13 @@
         <enumerator name='StatCnt' value='438'/>
       </enum-decl>
     </namespace-decl>
-    <namespace-decl name='__sanitizer'>
-      <!-- struct __sanitizer::CommonFlags -->
-      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-545'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- bool __sanitizer::CommonFlags::symbolize -->
-          <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- const char* __sanitizer::CommonFlags::external_symbolizer_path -->
-          <var-decl name='external_symbolizer_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='28' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- const char* __sanitizer::CommonFlags::strip_path_prefix -->
-          <var-decl name='strip_path_prefix' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='30' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <!-- bool __sanitizer::CommonFlags::fast_unwind_on_fatal -->
-          <var-decl name='fast_unwind_on_fatal' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='32' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='200'>
-          <!-- bool __sanitizer::CommonFlags::fast_unwind_on_malloc -->
-          <var-decl name='fast_unwind_on_malloc' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='34' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='208'>
-          <!-- bool __sanitizer::CommonFlags::handle_ioctl -->
-          <var-decl name='handle_ioctl' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='224'>
-          <!-- int __sanitizer::CommonFlags::malloc_context_size -->
-          <var-decl name='malloc_context_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='38' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='256'>
-          <!-- const char* __sanitizer::CommonFlags::log_path -->
-          <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
-          <!-- int __sanitizer::CommonFlags::verbosity -->
-          <var-decl name='verbosity' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='44' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='352'>
-          <!-- bool __sanitizer::CommonFlags::detect_leaks -->
-          <var-decl name='detect_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='360'>
-          <!-- bool __sanitizer::CommonFlags::leak_check_at_exit -->
-          <var-decl name='leak_check_at_exit' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='50' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='368'>
-          <!-- bool __sanitizer::CommonFlags::allocator_may_return_null -->
-          <var-decl name='allocator_may_return_null' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='52' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='376'>
-          <!-- bool __sanitizer::CommonFlags::print_summary -->
-          <var-decl name='print_summary' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='54' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <!-- struct __tsan::SignalDesc -->
-      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-520'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- bool __tsan::SignalDesc::armed -->
-          <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='8'>
-          <!-- bool __tsan::SignalDesc::sigaction -->
-          <var-decl name='sigaction' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='116' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- my_siginfo_t __tsan::SignalDesc::siginfo -->
-          <var-decl name='siginfo' type-id='type-id-564' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='1088'>
-          <!-- ucontext_t __tsan::SignalDesc::ctx -->
-          <var-decl name='ctx' type-id='type-id-565' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <!-- __sanitizer::ThreadContextBase** -->
     <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-557'/>
     <!-- bool (__sanitizer::ThreadContextBase*, void*)* -->
     <pointer-type-def type-id='type-id-566' size-in-bits='64' id='type-id-555'/>
-    <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression> -->
-    <qualified-type-def type-id='type-id-516' const='yes' id='type-id-559'/>
-    <!-- const __sanitizer::ThreadContextFactory -->
-    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-556'/>
-    <!-- const __tsan::Mutex -->
-    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-560'/>
-    <!-- const __tsan::SyncTab -->
-    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-561'/>
-    <!-- const __tsan::Vector<__tsan::RacyAddress> -->
-    <qualified-type-def type-id='type-id-515' const='yes' id='type-id-562'/>
-    <!-- const __tsan::Vector<__tsan::RacyStacks> -->
-    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-563'/>
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::FiredSuppression -->
-      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-547'>
+      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-546'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::ReportType __tsan::FiredSuppression::type -->
           <var-decl name='type' type-id='type-id-567' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='521' column='1'/>
@@ -11225,7 +11213,7 @@
     </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::RacyAddress -->
-      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-548'>
+      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-547'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::uptr __tsan::RacyAddress::addr_min -->
           <var-decl name='addr_min' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='516' column='1'/>
@@ -11238,7 +11226,7 @@
     </namespace-decl>
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::RacyStacks -->
-      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-549'>
+      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-548'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::MD5Hash __tsan::RacyStacks::hash[2] -->
           <var-decl name='hash' type-id='type-id-568' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='505' column='1'/>
@@ -11254,7 +11242,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::Mutex __tsan::SyncVar::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::SyncVar::addr -->
@@ -11306,13 +11294,13 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
           <!-- __tsan::SyncVar* __tsan::SyncVar::next -->
-          <var-decl name='next' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
+          <var-decl name='next' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::SyncVar::SyncVar(__sanitizer::uptr, __sanitizer::u64) -->
           <function-decl name='SyncVar' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncVar*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-106'/>
             <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -11325,7 +11313,7 @@
           <!-- __tsan::SyncVar::SyncVar(__sanitizer::uptr, __sanitizer::u64) -->
           <function-decl name='SyncVar' mangled-name='_ZN6__tsan7SyncVarC2Emy' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncVar*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-106'/>
             <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -11337,32 +11325,44 @@
       </class-decl>
     </namespace-decl>
     <!-- struct my_siginfo_t -->
-    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-564'>
+    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-559'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long long unsigned int my_siginfo_t::opaque[16] -->
         <var-decl name='opaque' type-id='type-id-569' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='34' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct ucontext_t -->
-    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-565'>
+    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-560'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long long unsigned int ucontext_t::opaque[118] -->
         <var-decl name='opaque' type-id='type-id-570' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='39' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression> -->
+    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-561'/>
+    <!-- const __sanitizer::ThreadContextFactory -->
+    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-556'/>
+    <!-- const __tsan::Mutex -->
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-562'/>
+    <!-- const __tsan::SyncTab -->
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-563'/>
+    <!-- const __tsan::Vector<__tsan::RacyAddress> -->
+    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-564'/>
+    <!-- const __tsan::Vector<__tsan::RacyStacks> -->
+    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-565'/>
     <namespace-decl name='__sanitizer'>
       <!-- typedef __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* __sanitizer::ThreadContextFactory -->
       <typedef-decl name='ThreadContextFactory' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-558'/>
     </namespace-decl>
     <!-- void (__sanitizer::ThreadContextBase*, void*)* -->
     <pointer-type-def type-id='type-id-572' size-in-bits='64' id='type-id-553'/>
+    <!-- __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* -->
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-571'/>
     <!-- MD5Hash[2] -->
-    <array-type-def dimensions='1' type-id='type-id-573' size-in-bits='256' id='type-id-568'>
+    <array-type-def dimensions='1' type-id='type-id-574' size-in-bits='256' id='type-id-568'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-50' id='type-id-499'/>
     </array-type-def>
-    <!-- __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-571'/>
     <namespace-decl name='__tsan'>
       <!-- enum __tsan::ReportType -->
       <enum-decl name='ReportType' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='19' column='1' id='type-id-567'>
@@ -11384,11 +11384,11 @@
     <!-- long long unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1024' id='type-id-569'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::MD5Hash -->
-      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-573'>
+      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-574'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- long long unsigned int __tsan::MD5Hash::hash[2] -->
           <var-decl name='hash' type-id='type-id-474' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='148' column='1'/>
@@ -11398,7 +11398,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::CommonFlags* -->
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-576'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-577'/>
     <!-- const char** -->
@@ -11442,7 +11442,7 @@
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
     <!-- SignalDesc[64] -->
-    <array-type-def dimensions='1' type-id='type-id-520' size-in-bits='552960' id='type-id-519'>
+    <array-type-def dimensions='1' type-id='type-id-521' size-in-bits='552960' id='type-id-517'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
@@ -11496,7 +11496,7 @@
     <!-- long long unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1024' id='type-id-569'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <!-- unsigned char[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='48' id='type-id-594'>
@@ -11511,7 +11511,7 @@
     <!-- unsigned long int[16] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-595'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <!-- unsigned long int[4] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-596'>
@@ -11586,14 +11586,14 @@
       </member-function>
     </class-decl>
     <!-- struct my_siginfo_t -->
-    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-564'>
+    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-559'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long long unsigned int my_siginfo_t::opaque[16] -->
         <var-decl name='opaque' type-id='type-id-569' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='34' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct ucontext_t -->
-    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-565'>
+    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-560'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long long unsigned int ucontext_t::opaque[118] -->
         <var-decl name='opaque' type-id='type-id-570' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='39' column='1'/>
@@ -11640,7 +11640,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- __tsan::Mutex AtExitContext::mtx_ -->
-        <var-decl name='mtx_' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
+        <var-decl name='mtx_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- void ()* AtExitContext::stack_[128] -->
@@ -11648,7 +11648,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='8256'>
         <!-- void* AtExitContext::args_[128] -->
-        <var-decl name='args_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='335' column='1'/>
+        <var-decl name='args_' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='335' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='16448'>
         <!-- bool AtExitContext::is_on_exits_[128] -->
@@ -12958,7 +12958,7 @@
     <!-- long int* -->
     <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-1376'/>
     <!-- my_siginfo_t* -->
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1377'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1377'/>
     <!-- sanitizer_kernel_iovec* -->
     <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-612'/>
     <!-- sanitizer_kernel_mmsghdr* -->
@@ -13743,7 +13743,7 @@
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::SignalDesc -->
-      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-520'>
+      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-521'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- bool __tsan::SignalDesc::armed -->
           <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
@@ -13754,11 +13754,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- my_siginfo_t __tsan::SignalDesc::siginfo -->
-          <var-decl name='siginfo' type-id='type-id-564' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
+          <var-decl name='siginfo' type-id='type-id-559' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
           <!-- ucontext_t __tsan::SignalDesc::ctx -->
-          <var-decl name='ctx' type-id='type-id-565' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
+          <var-decl name='ctx' type-id='type-id-560' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
         </data-member>
       </class-decl>
       <!-- unsigned long int __tsan::RoundUp<long unsigned int>(unsigned long int, __sanitizer::u64) -->
@@ -25128,7 +25128,7 @@
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1442' size-in-bits='64' id='type-id-1435'/>
     <!-- const __tsan::Vector<__tsan::JmpBuf>* -->
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1242'/>
     <!-- const int* -->
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-1441'/>
     <!-- __sanitizer::__sanitizer_dirent* (void*) -->
@@ -27268,7 +27268,7 @@
       <class-decl name='DynamicAnnContext' size-in-bits='3008' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='78' column='1' id='type-id-1457'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::Mutex __tsan::DynamicAnnContext::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='79' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='79' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __tsan::ExpectRace __tsan::DynamicAnnContext::expect -->
@@ -27876,12 +27876,12 @@
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
     <!-- PerClass[53] -->
-    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='440960' id='type-id-145'>
+    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='440960' id='type-id-144'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
     <!-- PerClass[53] -->
-    <array-type-def dimensions='1' type-id='type-id-506' size-in-bits='875136' id='type-id-510'>
+    <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='875136' id='type-id-508'>
       <!-- <anonymous range>[53] -->
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
@@ -27891,24 +27891,24 @@
       <subrange length='4' type-id='type-id-50' id='type-id-152'/>
     </array-type-def>
     <!-- atomic_uintptr_t[2048] -->
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-140'>
+    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-147'>
       <!-- <anonymous range>[2048] -->
       <subrange length='2048' type-id='type-id-50' id='type-id-154'/>
     </array-type-def>
     <!-- MD5Hash[2] -->
-    <array-type-def dimensions='1' type-id='type-id-573' size-in-bits='256' id='type-id-568'>
+    <array-type-def dimensions='1' type-id='type-id-574' size-in-bits='256' id='type-id-568'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-50' id='type-id-499'/>
     </array-type-def>
     <!-- Desc[16] -->
     <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <!-- Part[1009] -->
-    <array-type-def dimensions='1' type-id='type-id-529' size-in-bits='516608' id='type-id-533'>
+    <array-type-def dimensions='1' type-id='type-id-532' size-in-bits='516608' id='type-id-536'>
       <!-- <anonymous range>[1009] -->
-      <subrange length='1009' type-id='type-id-50' id='type-id-546'/>
+      <subrange length='1009' type-id='type-id-50' id='type-id-549'/>
     </array-type-def>
     <!-- bool -->
     <type-decl name='bool' size-in-bits='8' id='type-id-112'/>
@@ -27920,7 +27920,7 @@
       <subrange length='32' type-id='type-id-50' id='type-id-137'/>
     </array-type-def>
     <!-- char[48] -->
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-531'>
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-534'>
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-50' id='type-id-551'/>
     </array-type-def>
@@ -27929,12 +27929,12 @@
     <!-- long long unsigned int[11] -->
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='704' id='type-id-487'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-50' id='type-id-505'/>
+      <subrange length='11' type-id='type-id-50' id='type-id-519'/>
     </array-type-def>
     <!-- long long unsigned int[23] -->
-    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-518'>
+    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-516'>
       <!-- <anonymous range>[23] -->
-      <subrange length='23' type-id='type-id-50' id='type-id-542'/>
+      <subrange length='23' type-id='type-id-50' id='type-id-545'/>
     </array-type-def>
     <!-- long long unsigned int[2] -->
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='128' id='type-id-474'>
@@ -27953,7 +27953,7 @@
     <!-- unsigned int[16] -->
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='512' id='type-id-491'>
       <!-- <anonymous range>[16] -->
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <!-- unsigned long int[10] -->
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='640' id='type-id-234'>
@@ -27961,12 +27961,12 @@
       <subrange length='10' type-id='type-id-50' id='type-id-242'/>
     </array-type-def>
     <!-- void*[128] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-144'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-143'>
       <!-- <anonymous range>[128] -->
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
     <!-- void*[256] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-507'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-505'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-50' id='type-id-194'/>
     </array-type-def>
@@ -28055,7 +28055,7 @@
     <!-- __sanitizer::BlockingMutex* -->
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-235'/>
     <!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression>* -->
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-523'/>
     <!-- __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>* -->
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-1491'/>
     <!-- __sanitizer::IntrusiveList<__sanitizer::ThreadContextBase>* -->
@@ -28083,9 +28083,9 @@
     <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >* -->
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-1507'/>
     <!-- __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch* -->
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-526'/>
     <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* -->
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-141'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-140'/>
     <!-- __sanitizer::SpinMutex* -->
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-120'/>
     <!-- __sanitizer::StaticSpinMutex* -->
@@ -28095,11 +28095,11 @@
     <!-- __sanitizer::ThreadContextBase* -->
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-432'/>
     <!-- __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* -->
-    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-571'/>
     <!-- __sanitizer::ThreadContextBase** -->
     <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-557'/>
     <!-- __sanitizer::ThreadRegistry* -->
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-511'/>
     <!-- __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>* -->
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1509'/>
     <!-- __sanitizer::u64* -->
@@ -28117,37 +28117,37 @@
     <!-- __tsan::FastState* const -->
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-1511'/>
     <!-- __tsan::FiredSuppression& -->
-    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-1512'/>
     <!-- __tsan::FiredSuppression* -->
-    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-522'/>
     <!-- __tsan::Flags* -->
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-1513'/>
+    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-1513'/>
     <!-- __tsan::IgnoreSet* -->
     <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-492'/>
     <!-- __tsan::JmpBuf& -->
-    <reference-type-def kind='lvalue' type-id='type-id-503' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-1514'/>
     <!-- __tsan::JmpBuf* -->
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-496'/>
     <!-- __tsan::Mutex* -->
-    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-528'/>
     <!-- __tsan::MutexSet* -->
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-495'/>
     <!-- __tsan::RacyAddress& -->
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-1515'/>
+    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1515'/>
     <!-- __tsan::RacyAddress* -->
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-539'/>
     <!-- __tsan::RacyStacks& -->
-    <reference-type-def kind='lvalue' type-id='type-id-549' size-in-bits='64' id='type-id-1516'/>
+    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-1516'/>
     <!-- __tsan::RacyStacks* -->
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-542'/>
     <!-- __tsan::SignalContext* -->
     <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-482'/>
     <!-- __tsan::SyncTab* -->
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-537'/>
     <!-- __tsan::SyncTab::Part* -->
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-535'/>
     <!-- __tsan::SyncVar* -->
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-533'/>
     <!-- __tsan::ThreadContext* -->
     <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-480'/>
     <!-- __tsan::ThreadState* -->
@@ -28155,9 +28155,9 @@
     <!-- __tsan::Vector<__tsan::JmpBuf>* -->
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-497'/>
     <!-- __tsan::Vector<__tsan::RacyAddress>* -->
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-540'/>
     <!-- __tsan::Vector<__tsan::RacyStacks>* -->
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-543'/>
     <!-- a128* -->
     <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1517'/>
     <!-- a16* -->
@@ -28181,11 +28181,11 @@
     <!-- const __sanitizer::AllocatorStats* -->
     <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
     <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression> -->
-    <qualified-type-def type-id='type-id-516' const='yes' id='type-id-559'/>
+    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-561'/>
     <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-524'/>
+    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-524'/>
     <!-- const __sanitizer::InternalMmapVector<__tsan::FiredSuppression>* -->
-    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1526'/>
+    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-1526'/>
     <!-- const __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch> -->
     <qualified-type-def type-id='type-id-129' const='yes' id='type-id-1527'/>
     <!-- const __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>* -->
@@ -28221,7 +28221,7 @@
     <!-- const __tsan::FastState* const -->
     <qualified-type-def type-id='type-id-1534' const='yes' id='type-id-1535'/>
     <!-- const __tsan::FiredSuppression -->
-    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1536'/>
+    <qualified-type-def type-id='type-id-546' const='yes' id='type-id-1536'/>
     <!-- const __tsan::FiredSuppression& -->
     <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
     <!-- const __tsan::FiredSuppression* -->
@@ -28231,59 +28231,59 @@
     <!-- const __tsan::IgnoreSet* -->
     <pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-580'/>
     <!-- const __tsan::JmpBuf -->
-    <qualified-type-def type-id='type-id-503' const='yes' id='type-id-1539'/>
+    <qualified-type-def type-id='type-id-502' const='yes' id='type-id-1539'/>
     <!-- const __tsan::JmpBuf& -->
     <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <!-- const __tsan::MD5Hash -->
-    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1541'/>
+    <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1541'/>
     <!-- const __tsan::MD5Hash& -->
     <reference-type-def kind='lvalue' type-id='type-id-1541' size-in-bits='64' id='type-id-1542'/>
     <!-- const __tsan::MD5Hash* -->
     <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-1543'/>
     <!-- const __tsan::Mutex -->
-    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-560'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-562'/>
     <!-- const __tsan::Mutex& -->
-    <reference-type-def kind='lvalue' type-id='type-id-560' size-in-bits='64' id='type-id-528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-531'/>
     <!-- const __tsan::MutexSet -->
     <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1544'/>
     <!-- const __tsan::MutexSet* -->
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1545'/>
     <!-- const __tsan::RacyAddress -->
-    <qualified-type-def type-id='type-id-548' const='yes' id='type-id-1546'/>
+    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1546'/>
     <!-- const __tsan::RacyAddress& -->
     <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1547'/>
     <!-- const __tsan::RacyStacks -->
-    <qualified-type-def type-id='type-id-549' const='yes' id='type-id-1548'/>
+    <qualified-type-def type-id='type-id-548' const='yes' id='type-id-1548'/>
     <!-- const __tsan::RacyStacks& -->
     <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <!-- const __tsan::RacyStacks* -->
     <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-1550'/>
     <!-- const __tsan::SyncTab -->
-    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-561'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-563'/>
     <!-- const __tsan::SyncTab& -->
-    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-538'/>
     <!-- const __tsan::SyncVar -->
     <qualified-type-def type-id='type-id-550' const='yes' id='type-id-1551'/>
     <!-- const __tsan::SyncVar* -->
     <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
     <!-- const __tsan::Vector<__tsan::JmpBuf> -->
-    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-518'/>
     <!-- const __tsan::Vector<__tsan::JmpBuf>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-498'/>
     <!-- const __tsan::Vector<__tsan::JmpBuf>* -->
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1242'/>
     <!-- const __tsan::Vector<__tsan::RacyAddress> -->
-    <qualified-type-def type-id='type-id-515' const='yes' id='type-id-562'/>
+    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-564'/>
     <!-- const __tsan::Vector<__tsan::RacyAddress>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-541'/>
     <!-- const __tsan::Vector<__tsan::RacyAddress>* -->
-    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-1553'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1553'/>
     <!-- const __tsan::Vector<__tsan::RacyStacks> -->
-    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-563'/>
+    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-565'/>
     <!-- const __tsan::Vector<__tsan::RacyStacks>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-544'/>
     <!-- const __tsan::Vector<__tsan::RacyStacks>* -->
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1554'/>
+    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-1554'/>
     <!-- const char -->
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-3'/>
     <!-- const char* -->
@@ -28349,7 +28349,7 @@
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- struct __sanitizer::CommonFlags -->
-      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-545'>
+      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-527'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- bool __sanitizer::CommonFlags::symbolize -->
           <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
@@ -28580,7 +28580,7 @@
         </data-member>
       </class-decl>
       <!-- class __sanitizer::ThreadRegistry -->
-      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-521'>
+      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-520'>
         <member-type access='public'>
           <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
           <typedef-decl name='ThreadCallback' type-id='type-id-553' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-552'/>
@@ -28645,7 +28645,7 @@
           <!-- __sanitizer::ThreadRegistry::ThreadRegistry(__sanitizer::ThreadContextFactory, __sanitizer::u32, __sanitizer::u32) -->
           <function-decl name='ThreadRegistry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::ThreadRegistry*' -->
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::ThreadContextFactory' -->
             <parameter type-id='type-id-558'/>
             <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -28660,7 +28660,7 @@
           <!-- __sanitizer::ThreadRegistry::ThreadRegistry(__sanitizer::ThreadContextFactory, __sanitizer::u32, __sanitizer::u32) -->
           <function-decl name='ThreadRegistry' mangled-name='_ZN11__sanitizer14ThreadRegistryC2EPFPNS_17ThreadContextBaseEjEjj' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__sanitizer::ThreadRegistry*' -->
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::ThreadContextFactory' -->
             <parameter type-id='type-id-558'/>
             <!-- parameter of type 'typedef __sanitizer::u32' -->
@@ -28712,7 +28712,7 @@
       <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::atomic_uintptr_t __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::map1_[2048] -->
-          <var-decl name='map1_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
+          <var-decl name='map1_' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='131072'>
           <!-- __sanitizer::StaticSpinMutex __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>::mu_ -->
@@ -28805,13 +28805,13 @@
         </member-function>
       </class-decl>
       <!-- class __sanitizer::SizeClassMap<17ul, 64ul, 14ul> -->
-      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-146'>
+      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-145'>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch -->
           <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-125'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::next -->
-              <var-decl name='next' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::count -->
@@ -28819,7 +28819,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch::batch[64] -->
-              <var-decl name='batch' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-146' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -28946,11 +28946,11 @@
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-127'>
         <member-type access='public'>
           <!-- typedef __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::Batch -->
-          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-142'/>
+          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-141'/>
         </member-type>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass -->
-          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-143'>
+          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass::count -->
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
@@ -28961,7 +28961,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass::batch[128] -->
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -28971,7 +28971,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::PerClass __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::per_class_[53] -->
-          <var-decl name='per_class_' type-id='type-id-145' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='440960'>
           <!-- __sanitizer::AllocatorStats __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >::stats_ -->
@@ -28988,11 +28988,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>::first_ -->
-          <var-decl name='first_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+          <var-decl name='first_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch* __sanitizer::IntrusiveList<__sanitizer::SizeClassMap<17ul, 64ul, 14ul>::TransferBatch>::last_ -->
-          <var-decl name='last_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+          <var-decl name='last_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
         </data-member>
       </class-decl>
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 24ul, __sanitizer::TwoLevelByteMap<2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> > __sanitizer::InternalAllocatorCache -->
@@ -29012,7 +29012,7 @@
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass -->
-          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-506'>
+          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-504'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::count -->
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
@@ -29023,13 +29023,13 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass::batch[256] -->
-              <var-decl name='batch' type-id='type-id-507' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-505' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::Batch -->
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-508'/>
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-506'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const __sanitizer::uptr __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::kNumClasses -->
@@ -29037,7 +29037,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::PerClass __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::per_class_[53] -->
-          <var-decl name='per_class_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-508' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='875136'>
           <!-- __sanitizer::AllocatorStats __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> >::stats_ -->
@@ -29045,7 +29045,7 @@
         </data-member>
       </class-decl>
       <!-- class __sanitizer::InternalMmapVector<__tsan::FiredSuppression> -->
-      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-516'>
+      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-514'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::FiredSuppression* __sanitizer::InternalMmapVector<__tsan::FiredSuppression>::data_ -->
           <var-decl name='data_' type-id='type-id-522' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
@@ -29095,13 +29095,13 @@
       <!-- typedef __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* __sanitizer::ThreadContextFactory -->
       <typedef-decl name='ThreadContextFactory' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-558'/>
       <!-- class __sanitizer::SizeClassMap<17ul, 128ul, 16ul> -->
-      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-543'>
+      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-525'>
         <member-type access='public'>
           <!-- struct __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch -->
-          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-509'>
+          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-507'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::next -->
-              <var-decl name='next' type-id='type-id-544' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-526' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- __sanitizer::uptr __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::count -->
@@ -29109,7 +29109,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- void* __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch::batch[128] -->
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -29162,7 +29162,7 @@
       <class-decl name='SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='305' column='1' id='type-id-1498'>
         <member-type access='public'>
           <!-- typedef __sanitizer::SizeClassMap<17ul, 128ul, 16ul>::TransferBatch __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::Batch -->
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1502'/>
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1502'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > __sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback>::AllocatorCache -->
@@ -29360,16 +29360,16 @@
         </member-function>
       </class-decl>
       <!-- struct __tsan::MD5Hash -->
-      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-573'>
+      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-574'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- long long unsigned int __tsan::MD5Hash::hash[2] -->
           <var-decl name='hash' type-id='type-id-474' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='148' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __tsan::Flags -->
-      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-517'>
+      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-515'>
         <!-- struct __sanitizer::CommonFlags -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-545'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-527'/>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- bool __tsan::Flags::enable_annotations -->
           <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
@@ -29504,7 +29504,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::Mutex __tsan::SyncVar::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __sanitizer::uptr __tsan::SyncVar::addr -->
@@ -29556,13 +29556,13 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
           <!-- __tsan::SyncVar* __tsan::SyncVar::next -->
-          <var-decl name='next' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
+          <var-decl name='next' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::SyncVar::SyncVar(__sanitizer::uptr, __sanitizer::u64) -->
           <function-decl name='SyncVar' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncVar*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-106'/>
             <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -29575,7 +29575,7 @@
           <!-- __tsan::SyncVar::SyncVar(__sanitizer::uptr, __sanitizer::u64) -->
           <function-decl name='SyncVar' mangled-name='_ZN6__tsan7SyncVarC2Emy' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncVar*' -->
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'typedef __sanitizer::uptr' -->
             <parameter type-id='type-id-106'/>
             <!-- parameter of type 'typedef __sanitizer::u64' -->
@@ -29785,27 +29785,27 @@
       <!-- typedef __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator64<137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap<17ul, 128ul, 16ul>, __tsan::MapUnmapCallback> > __tsan::AllocatorCache -->
       <typedef-decl name='AllocatorCache' type-id='type-id-501' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='133' column='1' id='type-id-476'/>
       <!-- class __tsan::SyncTab -->
-      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-511'>
+      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-509'>
         <member-type access='private'>
           <!-- struct __tsan::SyncTab::Part -->
-          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-529'>
+          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-532'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- __tsan::Mutex __tsan::SyncTab::Part::mtx -->
-              <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
+              <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- __tsan::SyncVar* __tsan::SyncTab::Part::val -->
-              <var-decl name='val' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
+              <var-decl name='val' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- char __tsan::SyncTab::Part::pad[48] -->
-              <var-decl name='pad' type-id='type-id-531' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
+              <var-decl name='pad' type-id='type-id-534' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- __tsan::SyncTab::Part::Part() -->
               <function-decl name='Part' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type '__tsan::SyncTab::Part*' -->
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-4'/>
               </function-decl>
@@ -29814,7 +29814,7 @@
               <!-- __tsan::SyncTab::Part::Part() -->
               <function-decl name='Part' mangled-name='_ZN6__tsan7SyncTab4PartC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type '__tsan::SyncTab::Part*' -->
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-4'/>
               </function-decl>
@@ -29827,7 +29827,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::SyncTab::Part __tsan::SyncTab::tab_[1009] -->
-          <var-decl name='tab_' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
+          <var-decl name='tab_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='516608'>
           <!-- __sanitizer::atomic_uint64_t __tsan::SyncTab::uid_gen_ -->
@@ -29837,7 +29837,7 @@
           <!-- __tsan::SyncTab::SyncTab() -->
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -29846,7 +29846,7 @@
           <!-- __tsan::SyncTab::~SyncTab(int) -->
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -29857,9 +29857,9 @@
           <!-- __tsan::SyncTab::SyncTab(const __tsan::SyncTab&) -->
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::SyncTab&' -->
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-538'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -29868,7 +29868,7 @@
           <!-- __tsan::SyncTab::SyncTab() -->
           <function-decl name='SyncTab' mangled-name='_ZN6__tsan7SyncTabC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -29877,7 +29877,7 @@
           <!-- __tsan::SyncTab::~SyncTab(int) -->
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::SyncTab*' -->
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -29893,11 +29893,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __tsan::SyncTab __tsan::Context::synctab -->
-          <var-decl name='synctab' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
+          <var-decl name='synctab' type-id='type-id-509' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516736'>
           <!-- __tsan::Mutex __tsan::Context::report_mtx -->
-          <var-decl name='report_mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
+          <var-decl name='report_mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
           <!-- int __tsan::Context::nreported -->
@@ -29913,23 +29913,23 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='516928'>
           <!-- __sanitizer::ThreadRegistry* __tsan::Context::thread_registry -->
-          <var-decl name='thread_registry' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
+          <var-decl name='thread_registry' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516992'>
           <!-- __tsan::Vector<__tsan::RacyStacks> __tsan::Context::racy_stacks -->
-          <var-decl name='racy_stacks' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
+          <var-decl name='racy_stacks' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517248'>
           <!-- __tsan::Vector<__tsan::RacyAddress> __tsan::Context::racy_addresses -->
-          <var-decl name='racy_addresses' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
+          <var-decl name='racy_addresses' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517504'>
           <!-- __sanitizer::InternalMmapVector<__tsan::FiredSuppression> __tsan::Context::fired_suppressions -->
-          <var-decl name='fired_suppressions' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
+          <var-decl name='fired_suppressions' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517696'>
           <!-- __tsan::Flags __tsan::Context::flags -->
-          <var-decl name='flags' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
+          <var-decl name='flags' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='518656'>
           <!-- long long unsigned int __tsan::Context::stat[438] -->
@@ -29937,11 +29937,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='546688'>
           <!-- long long unsigned int __tsan::Context::int_alloc_cnt[23] -->
-          <var-decl name='int_alloc_cnt' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
+          <var-decl name='int_alloc_cnt' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='548160'>
           <!-- long long unsigned int __tsan::Context::int_alloc_siz[23] -->
-          <var-decl name='int_alloc_siz' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
+          <var-decl name='int_alloc_siz' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::Context::Context() -->
@@ -30010,7 +30010,7 @@
         </member-function>
       </class-decl>
       <!-- class __tsan::Mutex -->
-      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-512'>
+      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-510'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::atomic_uintptr_t __tsan::Mutex::state_ -->
           <var-decl name='state_' type-id='type-id-153' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='51' column='1'/>
@@ -30019,11 +30019,11 @@
           <!-- __tsan::Mutex::Mutex(__tsan::MutexType, __tsan::StatType) -->
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MutexType' -->
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-529'/>
             <!-- parameter of type 'enum __tsan::StatType' -->
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-530'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -30032,7 +30032,7 @@
           <!-- __tsan::Mutex::~Mutex(int) -->
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -30043,9 +30043,9 @@
           <!-- __tsan::Mutex::Mutex(const __tsan::Mutex&) -->
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::Mutex&' -->
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-531'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -30054,11 +30054,11 @@
           <!-- __tsan::Mutex::Mutex(__tsan::MutexType, __tsan::StatType) -->
           <function-decl name='Mutex' mangled-name='_ZN6__tsan5MutexC2ENS_9MutexTypeENS_8StatTypeE' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MutexType' -->
-            <parameter type-id='type-id-526'/>
+            <parameter type-id='type-id-529'/>
             <!-- parameter of type 'enum __tsan::StatType' -->
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-530'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -30067,7 +30067,7 @@
           <!-- __tsan::Mutex::~Mutex(int) -->
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -30205,28 +30205,28 @@
         </member-function>
       </class-decl>
       <!-- class __tsan::Vector<__tsan::RacyStacks> -->
-      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-514'>
+      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-512'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- const __tsan::MBlockType __tsan::Vector<__tsan::RacyStacks>::typ_ -->
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::begin_ -->
-          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::end_ -->
-          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <!-- __tsan::RacyStacks* __tsan::Vector<__tsan::RacyStacks>::last_ -->
-          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(__tsan::MBlockType) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MBlockType' -->
             <parameter type-id='type-id-451'/>
             <!-- void -->
@@ -30237,7 +30237,7 @@
           <!-- __tsan::Vector<__tsan::RacyStacks>::~Vector(int) -->
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -30248,16 +30248,16 @@
           <!-- void __tsan::Vector<__tsan::RacyStacks>::Vector(const __tsan::Vector<__tsan::RacyStacks>&) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyStacks>*' -->
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::Vector<__tsan::RacyStacks>&' -->
-            <parameter type-id='type-id-541'/>
+            <parameter type-id='type-id-544'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct __tsan::RacyStacks -->
-      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-549'>
+      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-548'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::MD5Hash __tsan::RacyStacks::hash[2] -->
           <var-decl name='hash' type-id='type-id-568' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='505' column='1'/>
@@ -30316,28 +30316,28 @@
         </member-function>
       </class-decl>
       <!-- class __tsan::Vector<__tsan::RacyAddress> -->
-      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-515'>
+      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-513'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- const __tsan::MBlockType __tsan::Vector<__tsan::RacyAddress>::typ_ -->
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::begin_ -->
-          <var-decl name='begin_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::end_ -->
-          <var-decl name='end_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
           <!-- __tsan::RacyAddress* __tsan::Vector<__tsan::RacyAddress>::last_ -->
-          <var-decl name='last_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __tsan::Vector<__tsan::RacyAddress>::Vector(__tsan::MBlockType) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- parameter of type 'enum __tsan::MBlockType' -->
             <parameter type-id='type-id-451'/>
             <!-- void -->
@@ -30348,7 +30348,7 @@
           <!-- __tsan::Vector<__tsan::RacyAddress>::~Vector(int) -->
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <!-- void -->
@@ -30359,16 +30359,16 @@
           <!-- void __tsan::Vector<__tsan::RacyAddress>::Vector(const __tsan::Vector<__tsan::RacyAddress>&) -->
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__tsan::Vector<__tsan::RacyAddress>*' -->
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <!-- parameter of type 'const __tsan::Vector<__tsan::RacyAddress>&' -->
-            <parameter type-id='type-id-538'/>
+            <parameter type-id='type-id-541'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct __tsan::JmpBuf -->
-      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-503'>
+      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-502'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::uptr __tsan::JmpBuf::sp -->
           <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
@@ -30383,7 +30383,7 @@
         </data-member>
       </class-decl>
       <!-- struct __tsan::RacyAddress -->
-      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-548'>
+      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-547'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::uptr __tsan::RacyAddress::addr_min -->
           <var-decl name='addr_min' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='516' column='1'/>
@@ -30394,7 +30394,7 @@
         </data-member>
       </class-decl>
       <!-- struct __tsan::FiredSuppression -->
-      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-547'>
+      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-546'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __tsan::ReportType __tsan::FiredSuppression::type -->
           <var-decl name='type' type-id='type-id-567' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='521' column='1'/>
@@ -30409,7 +30409,7 @@
         </data-member>
       </class-decl>
       <!-- enum __tsan::MutexType -->
-      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-526'>
+      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-529'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='MutexTypeInvalid' value='0'/>
         <enumerator name='MutexTypeTrace' value='1'/>
@@ -30440,11 +30440,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __tsan::SignalDesc __tsan::SignalContext::pending_signals[64] -->
-          <var-decl name='pending_signals' type-id='type-id-519' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
+          <var-decl name='pending_signals' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
         </data-member>
       </class-decl>
       <!-- enum __tsan::StatType -->
-      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-527'>
+      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-530'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='StatMop' value='0'/>
         <enumerator name='StatMopRead' value='1'/>
@@ -30913,7 +30913,7 @@
         <!-- parameter of type '__tsan::ThreadState*' -->
         <parameter type-id='type-id-467'/>
         <!-- parameter of type 'enum __tsan::StatType' -->
-        <parameter type-id='type-id-527'/>
+        <parameter type-id='type-id-530'/>
         <!-- parameter of type 'typedef __sanitizer::u64' -->
         <parameter type-id='type-id-157'/>
         <!-- void -->
@@ -31696,7 +31696,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
     <!-- __sanitizer::ThreadContextBase* (__sanitizer::u32) -->
-    <function-type size-in-bits='64' id='type-id-574'>
+    <function-type size-in-bits='64' id='type-id-573'>
       <!-- parameter of type 'typedef __sanitizer::u32' -->
       <parameter type-id='type-id-284'/>
       <!-- __sanitizer::ThreadContextBase* -->
@@ -31808,11 +31808,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- __tsan::Mutex __tsan::BlockDesc::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='30' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='30' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __tsan::SyncVar* __tsan::BlockDesc::head -->
-          <var-decl name='head' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='31' column='1'/>
+          <var-decl name='head' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='31' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <!-- __tsan::BlockDesc::BlockDesc() -->
@@ -32001,7 +32001,7 @@
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
     <!-- void*[64] -->
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-147'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-146'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
@@ -33808,7 +33808,7 @@
       <class-decl name='GenericScopedLock&lt;__tsan::Mutex&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='85' column='1' id='type-id-1758'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::Mutex* __sanitizer::GenericScopedLock<__tsan::Mutex>::mu_ -->
-          <var-decl name='mu_' type-id='type-id-525' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
+          <var-decl name='mu_' type-id='type-id-528' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __sanitizer::GenericScopedLock<__tsan::Mutex>::GenericScopedLock(__tsan::Mutex*) -->
@@ -33816,7 +33816,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__tsan::Mutex>*' -->
             <parameter type-id='type-id-1759' is-artificial='yes'/>
             <!-- parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-528'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -34301,10 +34301,6 @@
     </function-type>
     <!-- __tsan::Shadow* -->
     <pointer-type-def type-id='type-id-1781' size-in-bits='64' id='type-id-1783'/>
-    <!-- const __tsan::FastState& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1784'/>
-    <!-- const __tsan::Shadow -->
-    <qualified-type-def type-id='type-id-1781' const='yes' id='type-id-1785'/>
     <namespace-decl name='__tsan'>
       <!-- struct __tsan::Trace -->
       <class-decl name='Trace' size-in-bits='9257024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='60' column='1' id='type-id-1782'>
@@ -34314,7 +34310,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062656'>
           <!-- __tsan::Mutex __tsan::Trace::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062720'>
           <!-- unsigned long int __tsan::Trace::shadow_stack[65536] -->
@@ -34331,6 +34327,10 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- const __tsan::FastState& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1784'/>
+    <!-- const __tsan::Shadow -->
+    <qualified-type-def type-id='type-id-1781' const='yes' id='type-id-1785'/>
     <!-- TraceHeader[256] -->
     <array-type-def dimensions='1' type-id='type-id-1788' size-in-bits='5062656' id='type-id-1786'>
       <!-- <anonymous range>[256] -->
@@ -34532,9 +34532,9 @@
     <!-- __tsan::ScopedReport* const -->
     <qualified-type-def type-id='type-id-1805' const='yes' id='type-id-1806'/>
     <!-- __tsan::Vector<__tsan::RacyAddress>* const -->
-    <qualified-type-def type-id='type-id-537' const='yes' id='type-id-1807'/>
+    <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1807'/>
     <!-- __tsan::Vector<__tsan::RacyStacks>* const -->
-    <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1808'/>
+    <qualified-type-def type-id='type-id-543' const='yes' id='type-id-1808'/>
     <!-- __tsan::Vector<__tsan::ReportLocation*>* const -->
     <qualified-type-def type-id='type-id-1708' const='yes' id='type-id-1809'/>
     <!-- __tsan::Vector<__tsan::ReportMop*>* const -->
@@ -34805,7 +34805,7 @@
     <!-- __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>* -->
     <pointer-type-def type-id='type-id-1830' size-in-bits='64' id='type-id-1831'/>
     <!-- __sanitizer::ThreadRegistry* const -->
-    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-1832'/>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-1832'/>
     <!-- __tsan::ScopedReport* -->
     <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1805'/>
     <!-- __tsan::Shadow* -->
@@ -34885,7 +34885,7 @@
       <class-decl name='GenericScopedLock&lt;__sanitizer::ThreadRegistry&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='85' column='1' id='type-id-1830'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __sanitizer::ThreadRegistry* __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>::mu_ -->
-          <var-decl name='mu_' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
+          <var-decl name='mu_' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>::GenericScopedLock(__sanitizer::ThreadRegistry*) -->
@@ -34893,7 +34893,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>*' -->
             <parameter type-id='type-id-1831' is-artificial='yes'/>
             <!-- parameter of type '__sanitizer::ThreadRegistry*' -->
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-511'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -35041,7 +35041,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062656'>
           <!-- __tsan::Mutex __tsan::Trace::mtx -->
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062720'>
           <!-- unsigned long int __tsan::Trace::shadow_stack[65536] -->
@@ -35245,7 +35245,7 @@
         <!-- parameter of type '__tsan::ThreadState*' -->
         <parameter type-id='type-id-467'/>
         <!-- parameter of type 'enum __tsan::StatType' -->
-        <parameter type-id='type-id-527'/>
+        <parameter type-id='type-id-530'/>
         <!-- parameter of type 'typedef __sanitizer::u64' -->
         <parameter type-id='type-id-157'/>
         <!-- void -->
@@ -35804,9 +35804,9 @@
     <!-- __tsan::StackTrace* const -->
     <qualified-type-def type-id='type-id-1792' const='yes' id='type-id-1883'/>
     <!-- __tsan::SyncTab* const -->
-    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-1884'/>
+    <qualified-type-def type-id='type-id-537' const='yes' id='type-id-1884'/>
     <!-- __tsan::SyncVar*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-530' size-in-bits='64' id='type-id-1885'/>
+    <reference-type-def kind='lvalue' type-id='type-id-533' size-in-bits='64' id='type-id-1885'/>
     <!-- const __sanitizer::GenericScopedLock<__tsan::MBlock> -->
     <qualified-type-def type-id='type-id-1876' const='yes' id='type-id-1886'/>
     <!-- const __sanitizer::GenericScopedLock<__tsan::MBlock>& -->
@@ -35831,7 +35831,7 @@
       <class-decl name='GenericScopedReadLock&lt;__tsan::Mutex&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='104' column='1' id='type-id-1878'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- __tsan::Mutex* __sanitizer::GenericScopedReadLock<__tsan::Mutex>::mu_ -->
-          <var-decl name='mu_' type-id='type-id-525' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='116' column='1'/>
+          <var-decl name='mu_' type-id='type-id-528' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='116' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void __sanitizer::GenericScopedReadLock<__tsan::Mutex>::GenericScopedReadLock(__tsan::Mutex*) -->
@@ -35839,7 +35839,7 @@
             <!-- implicit parameter of type '__sanitizer::GenericScopedReadLock<__tsan::Mutex>*' -->
             <parameter type-id='type-id-1879' is-artificial='yes'/>
             <!-- parameter of type '__tsan::Mutex*' -->
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-528'/>
             <!-- void -->
             <return type-id='type-id-4'/>
           </function-decl>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index cf85ca0f..956f7172 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1870,6 +1870,17 @@
       <!-- enum hb_buffer_serialize_format_t -->
       <return type-id='type-id-90'/>
     </function-decl>
+    <!-- struct hb_shaper_data_t -->
+    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-146'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- void* hb_shaper_data_t::ot -->
+        <var-decl name='ot' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- void* hb_shaper_data_t::fallback -->
+        <var-decl name='fallback' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='54' column='1'/>
+      </data-member>
+    </class-decl>
     <!-- const char[1] -->
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='8' id='type-id-127'>
       <!-- <anonymous range>[1] -->
@@ -1977,17 +1988,6 @@
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-144'/>
     <!-- hb_font_funcs_t* -->
     <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-145'/>
-    <!-- struct hb_shaper_data_t -->
-    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-146'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void* hb_shaper_data_t::ot -->
-        <var-decl name='ot' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void* hb_shaper_data_t::fallback -->
-        <var-decl name='fallback' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='54' column='1'/>
-      </data-member>
-    </class-decl>
     <!-- typedef hb_face_t hb_face_t -->
     <typedef-decl name='hb_face_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-172'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
@@ -7223,238 +7223,6 @@
       <!-- typedef hb_position_t -->
       <return type-id='type-id-140'/>
     </function-type>
-    <!-- const OT::AnchorFormat1 -->
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-675'/>
-    <!-- const OT::AnchorFormat2 -->
-    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-676'/>
-    <!-- const OT::AnchorFormat3 -->
-    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-677'/>
-    <!-- const OT::AnchorMatrix -->
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-678'/>
-    <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-679'/>
-    <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-680'/>
-    <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-681'/>
-    <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-682'/>
-    <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-618' const='yes' id='type-id-683'/>
-    <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-684'/>
-    <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-685'/>
-    <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-686'/>
-    <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-687'/>
-    <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-619' const='yes' id='type-id-688'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-689'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-690'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-691'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-692'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-693'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-808' const='yes' id='type-id-694'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-695'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-696'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-697'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-698'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-699'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-700'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-701'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-814' const='yes' id='type-id-702'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-703'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-704'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-705'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-706'/>
-    <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-707'/>
-    <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-708'/>
-    <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-709'/>
-    <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-710'/>
-    <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-711'/>
-    <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-712'/>
-    <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-713'/>
-    <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-714'/>
-    <!-- const OT::CaretValueFormat1 -->
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-715'/>
-    <!-- const OT::CaretValueFormat2 -->
-    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-716'/>
-    <!-- const OT::CaretValueFormat3 -->
-    <qualified-type-def type-id='type-id-829' const='yes' id='type-id-717'/>
-    <!-- const OT::ClassDefFormat1 -->
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-718'/>
-    <!-- const OT::CmapSubtableFormat0 -->
-    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-719'/>
-    <!-- const OT::CmapSubtableFormat14 -->
-    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-720'/>
-    <!-- const OT::CmapSubtableFormat4 -->
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-721'/>
-    <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-722'/>
-    <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-    <qualified-type-def type-id='type-id-835' const='yes' id='type-id-723'/>
-    <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-724'/>
-    <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-725'/>
-    <!-- const OT::ContextFormat3 -->
-    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-726'/>
-    <!-- const OT::Device -->
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-727'/>
-    <!-- const OT::EncodingRecord -->
-    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-728'/>
-    <!-- const OT::ExtensionFormat1 -->
-    <qualified-type-def type-id='type-id-841' const='yes' id='type-id-729'/>
-    <!-- const OT::Feature -->
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-730'/>
-    <!-- const OT::FeatureParamsCharacterVariants -->
-    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-731'/>
-    <!-- const OT::FeatureParamsSize -->
-    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-732'/>
-    <!-- const OT::FeatureParamsStylisticSet -->
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-733'/>
-    <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-734'/>
-    <!-- const OT::LangSys -->
-    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-735'/>
-    <!-- const OT::Lookup -->
-    <qualified-type-def type-id='type-id-629' const='yes' id='type-id-736'/>
-    <!-- const OT::MarkBasePosFormat1 -->
-    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-737'/>
-    <!-- const OT::MarkLigPosFormat1 -->
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-738'/>
-    <!-- const OT::MarkMarkPosFormat1 -->
-    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-739'/>
-    <!-- const OT::MarkRecord -->
-    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-740'/>
-    <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-741'/>
-    <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-742'/>
-    <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-743'/>
-    <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-744'/>
-    <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-745'/>
-    <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-746'/>
-    <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-747'/>
-    <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-748'/>
-    <!-- const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-749'/>
-    <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-750'/>
-    <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-751'/>
-    <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-752'/>
-    <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-753'/>
-    <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-754'/>
-    <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-755'/>
-    <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-756'/>
-    <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-757'/>
-    <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-758'/>
-    <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-759'/>
-    <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-760'/>
-    <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-761'/>
-    <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-762'/>
-    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-763'/>
-    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-653' const='yes' id='type-id-764'/>
-    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-765'/>
-    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-766'/>
-    <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-767'/>
-    <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-768'/>
-    <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-769'/>
-    <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-770'/>
-    <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-771'/>
-    <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-772'/>
-    <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-773'/>
-    <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-774'/>
-    <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-664' const='yes' id='type-id-775'/>
-    <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-776'/>
-    <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-777'/>
-    <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-667' const='yes' id='type-id-778'/>
-    <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-779'/>
-    <!-- const OT::PairPosFormat1 -->
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-780'/>
-    <!-- const OT::PairPosFormat2 -->
-    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-781'/>
-    <!-- const OT::PairSet -->
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-782'/>
-    <!-- const OT::Record<OT::Feature> -->
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-783'/>
-    <!-- const OT::Record<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-784'/>
-    <!-- const OT::Record<OT::Script> -->
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-785'/>
-    <!-- const OT::SinglePosFormat1 -->
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-786'/>
-    <!-- const OT::SinglePosFormat2 -->
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-787'/>
-    <!-- const OT::VariationSelectorRecord -->
-    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-788'/>
-    <!-- const OT::_hea -->
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-789'/>
-    <!-- const OT::cmap -->
-    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-790'/>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-618'>
@@ -7464,7 +7232,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -7481,7 +7249,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -7498,7 +7266,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -7515,7 +7283,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-794' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -7528,17 +7296,17 @@
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-622'>
         <member-type access='public'>
           <!-- struct OT::Coverage::Iter -->
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-866'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-795'>
             <member-type access='private'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} -->
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-867'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-796'>
                 <data-member access='private'>
                   <!-- OT::CoverageFormat1::Iter format1 -->
-                  <var-decl name='format1' type-id='type-id-868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='private'>
                   <!-- OT::CoverageFormat2::Iter format2 -->
-                  <var-decl name='format2' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -7548,13 +7316,13 @@
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} OT::Coverage::Iter::u -->
-              <var-decl name='u' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-796' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- OT::Coverage::Iter::Iter() -->
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-870' is-artificial='yes'/>
+                <parameter type-id='type-id-799' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-13'/>
               </function-decl>
@@ -7563,7 +7331,7 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-871'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-800'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
@@ -7580,7 +7348,7 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} OT::Coverage::u -->
-          <var-decl name='u' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Coverage::min_size -->
@@ -7590,9 +7358,9 @@
           <!-- void OT::Coverage::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-872' is-artificial='yes'/>
+            <parameter type-id='type-id-801' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -7604,10 +7372,10 @@
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-623'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat1::Iter -->
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-868'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-797'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat1* OT::CoverageFormat1::Iter::c -->
-              <var-decl name='c' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-803' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat1::Iter::i -->
@@ -7631,9 +7399,9 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-874' is-artificial='yes'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -7642,9 +7410,9 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-874' is-artificial='yes'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -7656,10 +7424,10 @@
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-624'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat2::Iter -->
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-869'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-798'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat2* OT::CoverageFormat2::Iter::c -->
-              <var-decl name='c' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-805' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat2::Iter::i -->
@@ -7691,9 +7459,9 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-876' is-artificial='yes'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -7702,9 +7470,9 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-876' is-artificial='yes'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -7720,7 +7488,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -7733,7 +7501,7 @@
       <class-decl name='Ligature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-626'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::Ligature::ligGlyph -->
-          <var-decl name='ligGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::Ligature::component -->
@@ -7750,7 +7518,7 @@
       <class-decl name='LigatureSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-627'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::Ligature> OT::LigatureSet::ligature -->
-          <var-decl name='ligature' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-807' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSet::min_size -->
@@ -7771,7 +7539,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::LigatureSet> OT::LigatureSubstFormat1::ligatureSet -->
-          <var-decl name='ligatureSet' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-808' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSubstFormat1::min_size -->
@@ -7796,7 +7564,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::Lookup::markFilteringSetX[1] -->
-          <var-decl name='markFilteringSetX' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Lookup::min_size -->
@@ -7808,7 +7576,7 @@
       <!-- struct OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-630'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7823,7 +7591,7 @@
       <!-- struct OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-631'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7838,7 +7606,7 @@
       <!-- struct OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-632'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7853,7 +7621,7 @@
       <!-- struct OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-633'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7868,7 +7636,7 @@
       <!-- struct OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-634'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7883,7 +7651,7 @@
       <!-- struct OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-635'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7898,7 +7666,7 @@
       <!-- struct OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-636'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7913,7 +7681,7 @@
       <!-- struct OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-637'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7943,7 +7711,7 @@
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-639'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7973,7 +7741,7 @@
       <!-- struct OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-641'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -7988,7 +7756,7 @@
       <!-- struct OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-642'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8007,7 +7775,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::Feature>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-882'/>
+            <parameter type-id='type-id-811'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8018,7 +7786,7 @@
       <!-- struct OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-643'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8048,7 +7816,7 @@
       <!-- struct OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-644'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8067,7 +7835,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::LangSys>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-883'/>
+            <parameter type-id='type-id-812'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8078,7 +7846,7 @@
       <!-- struct OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-645'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8093,7 +7861,7 @@
       <!-- struct OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-646'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8108,7 +7876,7 @@
       <!-- struct OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-647'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8123,7 +7891,7 @@
       <!-- struct OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-648'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8138,7 +7906,7 @@
       <!-- struct OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-649'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8153,7 +7921,7 @@
       <!-- struct OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-650'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8168,7 +7936,7 @@
       <!-- struct OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-651'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8183,7 +7951,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-652'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8213,7 +7981,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-653'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8228,7 +7996,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-654'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8243,7 +8011,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-655'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8258,7 +8026,7 @@
       <!-- struct OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-656'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8277,7 +8045,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8288,7 +8056,7 @@
       <!-- struct OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-657'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8303,7 +8071,7 @@
       <!-- struct OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-658'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8333,7 +8101,7 @@
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-659'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8348,7 +8116,7 @@
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-660'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8363,7 +8131,7 @@
       <!-- struct OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-661'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8378,7 +8146,7 @@
       <!-- struct OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-662'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8393,7 +8161,7 @@
       <!-- struct OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-663'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8412,7 +8180,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::Script>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-885'/>
+            <parameter type-id='type-id-814'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -8423,7 +8191,7 @@
       <!-- struct OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-664'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8468,7 +8236,7 @@
       <!-- struct OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-667'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8483,7 +8251,7 @@
       <!-- struct OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-668'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -8564,9 +8332,9 @@
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-886' is-artificial='yes'/>
+            <parameter type-id='type-id-815' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -8577,14 +8345,14 @@
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-672'>
         <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-820'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-888' is-artificial='yes'/>
+            <parameter type-id='type-id-818' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -8600,9 +8368,9 @@
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -8611,44 +8379,44 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8658,7 +8426,7 @@
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-674'>
         <member-type access='public'>
           <!-- enum OT::SubstLookupSubTable::Type -->
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-898'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-828'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -8672,10 +8440,10 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-899'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-829'>
             <member-type access='private'>
               <!-- struct {OT::USHORT sub_format;} -->
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-900'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <!-- OT::USHORT sub_format -->
                   <var-decl name='sub_format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
@@ -8684,45 +8452,45 @@
             </member-type>
             <data-member access='private'>
               <!-- struct {OT::USHORT sub_format;} header -->
-              <var-decl name='header' type-id='type-id-900' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::SingleSubst single -->
-              <var-decl name='single' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::MultipleSubst multiple -->
-              <var-decl name='multiple' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AlternateSubst alternate -->
-              <var-decl name='alternate' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::LigatureSubst ligature -->
-              <var-decl name='ligature' type-id='type-id-904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextSubst context -->
-              <var-decl name='context' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextSubst chainContext -->
-              <var-decl name='chainContext' type-id='type-id-906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ExtensionSubst extension -->
-              <var-decl name='extension' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
-              <var-decl name='reverseChainContextSingle' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} OT::SubstLookupSubTable::u -->
-          <var-decl name='u' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SubstLookupSubTable::min_size -->
@@ -8732,162 +8500,368 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-909' is-artificial='yes'/>
+            <parameter type-id='type-id-839' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- IntType<short unsigned int, 2u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-862'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
-    </array-type-def>
-    <!-- OT::Coverage::Iter* -->
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-870'/>
-    <!-- OT::PairSet::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-884'/>
-    <!-- OT::hb_apply_context_t* -->
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-896'/>
-    <!-- OT::hb_closure_context_t* -->
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-894'/>
-    <!-- OT::hb_collect_glyphs_context_t* -->
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-892'/>
-    <!-- OT::hb_get_coverage_context_t* -->
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-910'/>
-    <!-- OT::hb_would_apply_context_t* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-890'/>
-    <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-863'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
-    </array-type-def>
-    <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-864'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
-    </array-type-def>
-    <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-865'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
-    </array-type-def>
-    <!-- USHORT[1] -->
-    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-880'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
-    </array-type-def>
-    <!-- const OT::Coverage* -->
-    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-872'/>
-    <!-- const OT::CoverageFormat1* -->
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-874'/>
-    <!-- const OT::CoverageFormat2* -->
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-876'/>
-    <!-- const OT::Record<OT::Feature>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-882'/>
-    <!-- const OT::Record<OT::LangSys>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-883'/>
-    <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-885'/>
-    <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-886'/>
-    <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-888'/>
-    <!-- const OT::SubstLookup* -->
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-889'/>
-    <!-- const OT::SubstLookupSubTable* -->
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-909'/>
-    <!-- const hb_codepoint_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-887'/>
-    <!-- hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-873'/>
-    <!-- hb_set_t* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-875'/>
+    <!-- const OT::AnchorFormat1 -->
+    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-675'/>
+    <!-- const OT::AnchorFormat2 -->
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-676'/>
+    <!-- const OT::AnchorFormat3 -->
+    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-677'/>
+    <!-- const OT::AnchorMatrix -->
+    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-678'/>
+    <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-679'/>
+    <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-680'/>
+    <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-681'/>
+    <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-682'/>
+    <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-618' const='yes' id='type-id-683'/>
+    <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-684'/>
+    <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-685'/>
+    <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-686'/>
+    <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-687'/>
+    <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-619' const='yes' id='type-id-688'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-689'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-690'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-691'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-692'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-693'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-694'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-695'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-696'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-697'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-698'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-699'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-700'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-701'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-865' const='yes' id='type-id-702'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-703'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-867' const='yes' id='type-id-704'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-705'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-706'/>
+    <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-707'/>
+    <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-708'/>
+    <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-709'/>
+    <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-710'/>
+    <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-711'/>
+    <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-712'/>
+    <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-713'/>
+    <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-714'/>
+    <!-- const OT::CaretValueFormat1 -->
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-715'/>
+    <!-- const OT::CaretValueFormat2 -->
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-716'/>
+    <!-- const OT::CaretValueFormat3 -->
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-717'/>
+    <!-- const OT::ClassDefFormat1 -->
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-718'/>
+    <!-- const OT::CmapSubtableFormat0 -->
+    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-719'/>
+    <!-- const OT::CmapSubtableFormat14 -->
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-720'/>
+    <!-- const OT::CmapSubtableFormat4 -->
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-721'/>
+    <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-722'/>
+    <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
+    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-723'/>
+    <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-724'/>
+    <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-725'/>
+    <!-- const OT::ContextFormat3 -->
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-726'/>
+    <!-- const OT::Device -->
+    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-727'/>
+    <!-- const OT::EncodingRecord -->
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-728'/>
+    <!-- const OT::ExtensionFormat1 -->
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-729'/>
+    <!-- const OT::Feature -->
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-730'/>
+    <!-- const OT::FeatureParamsCharacterVariants -->
+    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-731'/>
+    <!-- const OT::FeatureParamsSize -->
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-732'/>
+    <!-- const OT::FeatureParamsStylisticSet -->
+    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-733'/>
+    <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-734'/>
+    <!-- const OT::LangSys -->
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-735'/>
+    <!-- const OT::Lookup -->
+    <qualified-type-def type-id='type-id-629' const='yes' id='type-id-736'/>
+    <!-- const OT::MarkBasePosFormat1 -->
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-737'/>
+    <!-- const OT::MarkLigPosFormat1 -->
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-738'/>
+    <!-- const OT::MarkMarkPosFormat1 -->
+    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-739'/>
+    <!-- const OT::MarkRecord -->
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-740'/>
+    <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-741'/>
+    <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-742'/>
+    <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-743'/>
+    <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-744'/>
+    <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-745'/>
+    <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-746'/>
+    <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-747'/>
+    <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-748'/>
+    <!-- const OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-749'/>
+    <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-750'/>
+    <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-751'/>
+    <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-752'/>
+    <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-753'/>
+    <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-754'/>
+    <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-755'/>
+    <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-756'/>
+    <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-757'/>
+    <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-758'/>
+    <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-759'/>
+    <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-760'/>
+    <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-761'/>
+    <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-762'/>
+    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-763'/>
+    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-653' const='yes' id='type-id-764'/>
+    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-765'/>
+    <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-766'/>
+    <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-767'/>
+    <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-768'/>
+    <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-769'/>
+    <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-770'/>
+    <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-771'/>
+    <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-772'/>
+    <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-773'/>
+    <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-774'/>
+    <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-664' const='yes' id='type-id-775'/>
+    <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-776'/>
+    <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-777'/>
+    <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-667' const='yes' id='type-id-778'/>
+    <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-779'/>
+    <!-- const OT::PairPosFormat1 -->
+    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-780'/>
+    <!-- const OT::PairPosFormat2 -->
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-781'/>
+    <!-- const OT::PairSet -->
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-782'/>
+    <!-- const OT::Record<OT::Feature> -->
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-783'/>
+    <!-- const OT::Record<OT::LangSys> -->
+    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-784'/>
+    <!-- const OT::Record<OT::Script> -->
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-785'/>
+    <!-- const OT::SinglePosFormat1 -->
+    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-786'/>
+    <!-- const OT::SinglePosFormat2 -->
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-787'/>
+    <!-- const OT::VariationSelectorRecord -->
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-788'/>
+    <!-- const OT::_hea -->
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-789'/>
+    <!-- const OT::cmap -->
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-790'/>
+    <!-- OT::Coverage::Iter* -->
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-799'/>
+    <!-- IntType<short unsigned int, 2u>[1] -->
+    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-791'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
+    </array-type-def>
+    <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
+    <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='16' id='type-id-792'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
+    </array-type-def>
+    <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
+    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-793'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
+    </array-type-def>
+    <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
+    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-794'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
+    </array-type-def>
+    <!-- OT::PairSet::sanitize_closure_t* -->
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-813'/>
+    <!-- USHORT[1] -->
+    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-809'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-171'/>
+    </array-type-def>
+    <!-- OT::hb_apply_context_t* -->
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-826'/>
+    <!-- OT::hb_closure_context_t* -->
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-824'/>
+    <!-- OT::hb_collect_glyphs_context_t* -->
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-822'/>
+    <!-- OT::hb_get_coverage_context_t* -->
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-840'/>
+    <!-- OT::hb_would_apply_context_t* -->
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-820'/>
     <namespace-decl name='OT'>
       <!-- struct OT::AlternateSubst -->
-      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-903'>
+      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-833'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-930'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-918'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AlternateSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} OT::AlternateSubst::u -->
-          <var-decl name='u' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::AnchorFormat1 -->
-      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-791'>
+      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-842'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
@@ -8912,7 +8886,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::AnchorFormat2 -->
-      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-792'>
+      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-843'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
@@ -8941,7 +8915,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::AnchorFormat3 -->
-      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-793'>
+      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-844'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
@@ -8974,14 +8948,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::AnchorMatrix -->
-      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-794'>
+      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-845'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorMatrix::rows -->
           <var-decl name='rows' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::AnchorMatrix::matrixZ[1] -->
-          <var-decl name='matrixZ' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorMatrix::min_size -->
@@ -8991,14 +8965,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-795'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-846'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::CmapSubtableLongGroup OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-922' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9008,14 +8982,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-796'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-847'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EncodingRecord OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9027,7 +9001,7 @@
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-458' is-artificial='yes'/>
             <!-- parameter of type 'const OT::EncodingRecord&' -->
-            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-924'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -9036,14 +9010,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-797'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-848'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EntryExitRecord OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9053,14 +9027,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-798'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-849'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Index OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9070,14 +9044,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-799'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-850'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9087,14 +9061,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-800'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-851'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<unsigned int, 3u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9104,14 +9078,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-801'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-852'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::LookupRecord OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9121,14 +9095,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-802'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-853'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::MarkRecord OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9138,14 +9112,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-803'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-854'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9155,7 +9129,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-943' is-artificial='yes'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -9170,14 +9144,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-804'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-855'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9187,14 +9161,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-805'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9204,14 +9178,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-806'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-857'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9221,14 +9195,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-807'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-858'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9238,14 +9212,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-808'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-859'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9255,14 +9229,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-809'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-860'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9272,14 +9246,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-810'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-861'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9289,14 +9263,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-811'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-862'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9306,14 +9280,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-812'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-863'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9323,13 +9297,13 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<OT::PairSet::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, OT::PairSet::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -9338,14 +9312,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-813'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-864'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9355,14 +9329,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-814'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-865'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-943' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9372,7 +9346,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-956' is-artificial='yes'/>
+            <parameter type-id='type-id-944' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -9387,14 +9361,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-815'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-866'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9404,14 +9378,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-816'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-867'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9421,14 +9395,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-868'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9438,14 +9412,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-818'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-869'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9455,14 +9429,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-819'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-870'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9472,7 +9446,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-962' is-artificial='yes'/>
+            <parameter type-id='type-id-950' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -9487,14 +9461,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-820'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::RangeRecord OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9504,14 +9478,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-821'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-871'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Feature> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9521,14 +9495,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-822'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-872'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::LangSys> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-953' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9538,14 +9512,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-823'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-873'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Script> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -9555,14 +9529,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-824'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-874'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UVSMapping OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9572,14 +9546,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-825'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-875'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UnicodeValueRange OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9589,14 +9563,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-826'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-876'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::VariationSelectorRecord OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9606,7 +9580,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CaretValueFormat1 -->
-      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-827'>
+      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-877'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat1::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
@@ -9627,7 +9601,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CaretValueFormat2 -->
-      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-828'>
+      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-878'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat2::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
@@ -9648,7 +9622,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CaretValueFormat3 -->
-      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-829'>
+      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-879'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat3::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
@@ -9673,21 +9647,21 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ChainContextSubst -->
-      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-906'>
+      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-836'>
         <!-- struct OT::ChainContext -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ClassDefFormat1 -->
-      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-830'>
+      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-880'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ClassDefFormat1::classFormat -->
           <var-decl name='classFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::ClassDefFormat1::startGlyph -->
-          <var-decl name='startGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat1::classValue -->
@@ -9703,7 +9677,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
             <parameter type-id='type-id-531' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -9714,7 +9688,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableFormat0 -->
-      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-831'>
+      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-881'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat0::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
@@ -9729,7 +9703,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::BYTE OT::CmapSubtableFormat0::glyphIdArray[256] -->
-          <var-decl name='glyphIdArray' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat0::static_size -->
@@ -9743,7 +9717,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableFormat14 -->
-      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-832'>
+      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-882'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat14::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
@@ -9754,7 +9728,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > OT::CmapSubtableFormat14::record -->
-          <var-decl name='record' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat14::min_size -->
@@ -9764,7 +9738,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableFormat4 -->
-      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-833'>
+      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-883'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
@@ -9795,7 +9769,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::values[1] -->
-          <var-decl name='values' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat4::min_size -->
@@ -9805,7 +9779,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-834'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-884'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
@@ -9824,7 +9798,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::groups -->
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::min_size -->
@@ -9834,7 +9808,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-835'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-885'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
@@ -9853,7 +9827,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::groups -->
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::min_size -->
@@ -9863,7 +9837,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-836'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-886'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::formatReserved -->
           <var-decl name='formatReserved' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
@@ -9892,7 +9866,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-837'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-887'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::formatReserved -->
           <var-decl name='formatReserved' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
@@ -9911,7 +9885,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::glyphIdArray -->
-          <var-decl name='glyphIdArray' type-id='type-id-799' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::min_size -->
@@ -9921,7 +9895,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ContextFormat3 -->
-      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-838'>
+      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-888'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
@@ -9936,11 +9910,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ContextFormat3::coverageZ[1] -->
-          <var-decl name='coverageZ' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::LookupRecord OT::ContextFormat3::lookupRecordX[1] -->
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat3::min_size -->
@@ -9950,14 +9924,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ContextSubst -->
-      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-905'>
+      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-835'>
         <!-- struct OT::Context -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Device -->
-      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-839'>
+      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-889'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::Device::startSize -->
           <var-decl name='startSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
@@ -9972,7 +9946,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::Device::deltaValue[1] -->
-          <var-decl name='deltaValue' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Device::min_size -->
@@ -9982,7 +9956,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::EncodingRecord -->
-      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-840'>
+      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-890'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::EncodingRecord::platformID -->
           <var-decl name='platformID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
@@ -10007,7 +9981,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ExtensionFormat1 -->
-      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-841'>
+      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-891'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ExtensionFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
@@ -10032,21 +10006,21 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ExtensionSubst -->
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-907'>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-837'>
         <!-- struct OT::Extension<OT::ExtensionSubst> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Feature -->
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-842'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-892'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > OT::Feature::featureParams -->
           <var-decl name='featureParams' type-id='type-id-643' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IndexArray OT::Feature::lookupIndex -->
-          <var-decl name='lookupIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Feature::min_size -->
@@ -10056,7 +10030,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::FeatureParamsCharacterVariants -->
-      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-843'>
+      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-893'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
@@ -10083,7 +10057,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > OT::FeatureParamsCharacterVariants::characters -->
-          <var-decl name='characters' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsCharacterVariants::min_size -->
@@ -10093,7 +10067,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::FeatureParamsSize -->
-      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-844'>
+      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-894'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsSize::designSize -->
           <var-decl name='designSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
@@ -10126,7 +10100,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::FeatureParamsStylisticSet -->
-      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-845'>
+      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsStylisticSet::version -->
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
@@ -10147,10 +10121,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::LangSys -->
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-846'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-896'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::LangSys::lookupOrderZ -->
-          <var-decl name='lookupOrderZ' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-810' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::LangSys::reqFeatureIndex -->
@@ -10158,7 +10132,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IndexArray OT::LangSys::featureIndex -->
-          <var-decl name='featureIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LangSys::min_size -->
@@ -10168,10 +10142,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::LigatureSubst -->
-      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-904'>
+      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-834'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-977'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-965'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
@@ -10184,68 +10158,68 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} OT::LigatureSubst::u -->
-          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MarkBasePosFormat1 -->
-      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-847'>
+      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-897'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkBasePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
@@ -10282,7 +10256,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MarkLigPosFormat1 -->
-      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-848'>
+      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-898'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkLigPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
@@ -10319,7 +10293,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MarkMarkPosFormat1 -->
-      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-849'>
+      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-899'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkMarkPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
@@ -10356,7 +10330,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MarkRecord -->
-      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-850'>
+      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-900'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkRecord::klass -->
           <var-decl name='klass' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
@@ -10377,84 +10351,84 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MultipleSubst -->
-      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-902'>
+      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-832'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-979'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-967'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::MultipleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} OT::MultipleSubst::u -->
-          <var-decl name='u' type-id='type-id-979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-881'>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-810'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <data-member access='public' static='yes'>
@@ -10469,21 +10443,21 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::Ligature> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-878'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-807'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-620'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::LigatureSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-879'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-808'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-621'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::PairPosFormat1 -->
-      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-851'>
+      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-901'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
@@ -10494,15 +10468,15 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::PairSet> OT::PairPosFormat1::pairSet -->
-          <var-decl name='pairSet' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat1::min_size -->
@@ -10512,7 +10486,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::PairPosFormat2 -->
-      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-852'>
+      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-902'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
@@ -10523,11 +10497,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat2::classDef1 -->
@@ -10547,7 +10521,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ValueRecord OT::PairPosFormat2::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat2::min_size -->
@@ -10557,7 +10531,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::PairSet -->
-      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-853'>
+      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-903'>
         <member-type access='public'>
           <!-- struct OT::PairSet::sanitize_closure_t -->
           <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-912'>
@@ -10567,7 +10541,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- OT::ValueFormat* OT::PairSet::sanitize_closure_t::valueFormats -->
-              <var-decl name='valueFormats' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- unsigned int OT::PairSet::sanitize_closure_t::len1 -->
@@ -10585,7 +10559,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::PairSet::arrayZ[1] -->
-          <var-decl name='arrayZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairSet::min_size -->
@@ -10595,10 +10569,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Record<OT::Feature> -->
-      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-854'>
+      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-904'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Feature>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-986'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-974'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Feature>::tag -->
@@ -10620,10 +10594,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Record<OT::LangSys> -->
-      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-855'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-905'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::LangSys>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-987'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-975'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::LangSys>::tag -->
@@ -10645,10 +10619,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Record<OT::Script> -->
-      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-856'>
+      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Script>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-988'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-976'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Script>::tag -->
@@ -10670,84 +10644,84 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ReverseChainSingleSubst -->
-      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-908'>
+      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-838'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-989'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-977'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ReverseChainSingleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} OT::ReverseChainSingleSubst::u -->
-          <var-decl name='u' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SinglePosFormat1 -->
-      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-857'>
+      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-907'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
@@ -10758,11 +10732,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat1::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueRecord OT::SinglePosFormat1::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat1::min_size -->
@@ -10772,7 +10746,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SinglePosFormat2 -->
-      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-858'>
+      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-908'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
@@ -10783,7 +10757,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat2::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::SinglePosFormat2::valueCount -->
@@ -10791,7 +10765,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ValueRecord OT::SinglePosFormat2::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat2::min_size -->
@@ -10801,10 +10775,10 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SingleSubst -->
-      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-901'>
+      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-831'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-992'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-980'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
@@ -10821,71 +10795,71 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} OT::SingleSubst::u -->
-          <var-decl name='u' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::SingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::VariationSelectorRecord -->
-      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-859'>
+      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-909'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::VariationSelectorRecord::varSelector -->
-          <var-decl name='varSelector' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > OT::VariationSelectorRecord::defaultUVS -->
@@ -10907,7 +10881,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::_hea -->
-      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-860'>
+      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-910'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_hea::tableTag -->
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
@@ -10926,31 +10900,31 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::FWORD OT::_hea::ascender -->
-          <var-decl name='ascender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
           <!-- OT::FWORD OT::_hea::descender -->
-          <var-decl name='descender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::FWORD OT::_hea::lineGap -->
-          <var-decl name='lineGap' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
           <!-- OT::UFWORD OT::_hea::advanceMax -->
-          <var-decl name='advanceMax' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::FWORD OT::_hea::minLeadingBearing -->
-          <var-decl name='minLeadingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
           <!-- OT::FWORD OT::_hea::minTrailingBearing -->
-          <var-decl name='minTrailingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::FWORD OT::_hea::maxExtent -->
-          <var-decl name='maxExtent' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
           <!-- OT::SHORT OT::_hea::caretSlopeRise -->
@@ -11000,7 +10974,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::cmap -->
-      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-861'>
+      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-911'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::cmap::tableTag -->
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
@@ -11011,7 +10985,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > OT::cmap::encodingRecord -->
-          <var-decl name='encodingRecord' type-id='type-id-997' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::cmap::min_size -->
@@ -11019,15 +10993,41 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <!-- const OT::Coverage* -->
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-801'/>
+    <!-- const OT::CoverageFormat1* -->
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-803'/>
+    <!-- const OT::CoverageFormat2* -->
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-805'/>
+    <!-- const OT::Record<OT::Feature>::sanitize_closure_t* -->
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-811'/>
+    <!-- const OT::Record<OT::LangSys>::sanitize_closure_t* -->
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-812'/>
+    <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-814'/>
+    <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-815'/>
+    <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-818'/>
+    <!-- const OT::SubstLookup* -->
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-819'/>
+    <!-- const OT::SubstLookupSubTable* -->
+    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-839'/>
+    <!-- const hb_codepoint_t& -->
+    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-816'/>
+    <!-- hb_set_digest_t* -->
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-802'/>
+    <!-- hb_set_t* -->
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-804'/>
     <namespace-decl name='OT'>
       <!-- typedef OT::USHORT OT::GlyphID -->
-      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-877'/>
+      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-806'/>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11035,7 +11035,7 @@
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11043,7 +11043,7 @@
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11051,7 +11051,7 @@
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11059,222 +11059,188 @@
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
       </class-decl>
     </namespace-decl>
+    <!-- OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-931'/>
+    <!-- OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-941'/>
+    <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-944'/>
+    <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-950'/>
     <!-- BYTE[256] -->
-    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
+    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-959'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-4' id='type-id-1001'/>
     </array-type-def>
     <!-- CmapSubtableLongGroup[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-934'>
+    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-922'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- EncodingRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='64' id='type-id-935'>
+    <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='64' id='type-id-923'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- EntryExitRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
+    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-925'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Index[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-938'>
+    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-926'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-939'>
+    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-927'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- LookupRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-940'>
+    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-928'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- MarkRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-850' size-in-bits='32' id='type-id-941'>
+    <array-type-def dimensions='1' type-id='type-id-900' size-in-bits='32' id='type-id-929'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <!-- OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-943'/>
-    <!-- OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-953'/>
-    <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-956'/>
-    <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-962'/>
-    <!-- OT::ValueFormat* -->
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-985'/>
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-933'>
+    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-921'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-942'>
+    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-930'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-944'>
+    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-932'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-945'>
+    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-933'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-946'>
+    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-934'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-947'>
+    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-935'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-948'>
+    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-936'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-949'>
+    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-937'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-950'>
+    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-938'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-951'>
+    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-939'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-952'>
+    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-940'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-954'>
+    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-942'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-955'>
+    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-943'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-957'>
+    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-945'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-958'>
+    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-946'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-959'>
+    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-947'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-960'>
+    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-948'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-961'>
+    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-949'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- RangeRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-963'>
+    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-951'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-854' size-in-bits='48' id='type-id-964'>
+    <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='48' id='type-id-952'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='48' id='type-id-965'>
+    <array-type-def dimensions='1' type-id='type-id-905' size-in-bits='48' id='type-id-953'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-856' size-in-bits='48' id='type-id-966'>
+    <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='48' id='type-id-954'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- UVSMapping[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-967'>
+    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-955'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-968'>
+    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-956'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
+    <!-- OT::ValueFormat* -->
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-973'/>
     <!-- VariationSelectorRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='88' id='type-id-969'>
+    <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='88' id='type-id-957'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <!-- const OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-932'/>
-    <!-- const OT::Coverage -->
-    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-918'/>
-    <!-- const OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-999'/>
-    <!-- const OT::CoverageFormat1 -->
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-919'/>
-    <!-- const OT::CoverageFormat2 -->
-    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-920'/>
-    <!-- const OT::EncodingRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-936'/>
-    <!-- const OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-978'/>
-    <!-- const OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-981'/>
-    <!-- const OT::Record<OT::Feature>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-921'/>
-    <!-- const OT::Record<OT::LangSys>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-922'/>
-    <!-- const OT::Record<OT::Script>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-923'/>
-    <!-- const OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-991'/>
-    <!-- const OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-993'/>
-    <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-924'/>
-    <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-925'/>
-    <!-- const OT::SubstLookup -->
-    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-926'/>
-    <!-- const OT::SubstLookupSubTable -->
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-927'/>
     <namespace-decl name='OT'>
       <!-- struct OT::AlternateSubstFormat1 -->
-      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-931'>
+      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-919'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AlternateSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
@@ -11285,7 +11251,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > OT::AlternateSubstFormat1::alternateSet -->
-          <var-decl name='alternateSet' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AlternateSubstFormat1::min_size -->
@@ -11295,226 +11261,226 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ChainContext -->
-      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-970'>
+      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-958'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1016'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1011'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} OT::ChainContext::u -->
-          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1011' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::ChainContext::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Context -->
-      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-974'>
+      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-962'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1021'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1016'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} OT::Context::u -->
-          <var-decl name='u' type-id='type-id-1021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Context::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::Context::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::Extension<OT::ExtensionSubst> -->
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-975'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-963'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1025'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1020'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ExtensionFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} OT::Extension<OT::ExtensionSubst>::u -->
-          <var-decl name='u' type-id='type-id-1025' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1027'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::IndexArray -->
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-976'>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-964'>
         <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-798'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::MultipleSubstFormat1 -->
-      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-980'>
+      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-968'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MultipleSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
@@ -11525,7 +11491,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Sequence> OT::MultipleSubstFormat1::sequence -->
-          <var-decl name='sequence' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MultipleSubstFormat1::min_size -->
@@ -11535,14 +11501,14 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::PairSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-983'>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-971'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-863'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ReverseChainSingleSubstFormat1 -->
-      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-990'>
+      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-978'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ReverseChainSingleSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
@@ -11553,11 +11519,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ReverseChainSingleSubstFormat1::substituteX -->
@@ -11571,16 +11537,16 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-973'>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-961'>
         <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1025' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -11589,23 +11555,23 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-997'>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-985'>
         <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-796'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-847'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-972'>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-960'>
         <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-826'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-876'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-1031' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -11614,12 +11580,12 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ValueFormat -->
-      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-982'>
+      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-970'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <member-type access='public'>
           <!-- enum OT::ValueFormat::Flags -->
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1032'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1027'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -11641,10 +11607,10 @@
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::matcher_t -->
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1033'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1028'>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1034'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1029'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -11653,7 +11619,7 @@
             </member-type>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1035'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1030'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -11662,7 +11628,7 @@
             </member-type>
             <member-type access='public'>
               <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
-              <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1036'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::matcher_t::lookup_props -->
@@ -11686,7 +11652,7 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t::match_func_t OT::hb_apply_context_t::matcher_t::match_func -->
-              <var-decl name='match_func' type-id='type-id-1036' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1031' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <!-- void* OT::hb_apply_context_t::matcher_t::match_data -->
@@ -11696,7 +11662,7 @@
               <!-- OT::hb_apply_context_t::matcher_t::matcher_t() -->
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-1033' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-13'/>
               </function-decl>
@@ -11705,22 +11671,22 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1039'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1034'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_backward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_backward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_backward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::num_items -->
@@ -11730,9 +11696,9 @@
               <!-- OT::hb_apply_context_t::skipping_backward_iterator_t::skipping_backward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1041' is-artificial='yes'/>
+                <parameter type-id='type-id-1036' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-826'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -11747,22 +11713,22 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1042'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1037'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_forward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_forward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_forward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::num_items -->
@@ -11776,9 +11742,9 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1043' is-artificial='yes'/>
+                <parameter type-id='type-id-1038' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-826'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -11793,11 +11759,11 @@
         </member-type>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1044'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1040' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1039'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef bool OT::hb_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
@@ -11833,7 +11799,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- OT::hb_apply_context_t::recurse_func_t OT::hb_apply_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1044' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1039' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <!-- unsigned int OT::hb_apply_context_t::nesting_level_left -->
@@ -11845,7 +11811,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- const OT::GDEF& OT::hb_apply_context_t::gdef -->
-          <var-decl name='gdef' type-id='type-id-1046' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1041' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- bool OT::hb_apply_context_t::has_glyph_classes -->
@@ -11859,7 +11825,7 @@
           <!-- OT::hb_apply_context_t::hb_apply_context_t(unsigned int, hb_font_t*, hb_buffer_t*) -->
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_font_t*' -->
@@ -11874,220 +11840,220 @@
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12097,11 +12063,11 @@
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1068' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1067'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1062'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_closure_context_t::max_debug_depth -->
@@ -12113,11 +12079,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_closure_context_t::glyphs -->
-          <var-decl name='glyphs' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::hb_closure_context_t::recurse_func_t OT::hb_closure_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1067' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1062' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- unsigned int OT::hb_closure_context_t::nesting_level_left -->
@@ -12131,11 +12097,11 @@
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -12146,132 +12112,132 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12281,11 +12247,11 @@
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1070' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1069'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1065' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1064'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
@@ -12297,27 +12263,27 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::before -->
-          <var-decl name='before' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::input -->
-          <var-decl name='input' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::after -->
-          <var-decl name='after' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::output -->
-          <var-decl name='output' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- OT::hb_collect_glyphs_context_t::recurse_func_t OT::hb_collect_glyphs_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1069' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1064' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- hb_set_t OT::hb_collect_glyphs_context_t::recursed_lookups -->
-          <var-decl name='recursed_lookups' type-id='type-id-1071' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1066' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <!-- unsigned int OT::hb_collect_glyphs_context_t::nesting_level_left -->
@@ -12331,17 +12297,17 @@
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -12352,7 +12318,7 @@
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <!-- void -->
@@ -12363,220 +12329,220 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12586,7 +12552,7 @@
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_get_coverage_context_t::max_debug_depth -->
@@ -12600,7 +12566,7 @@
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -12609,220 +12575,220 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12832,7 +12798,7 @@
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
@@ -12862,7 +12828,7 @@
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
@@ -12879,141 +12845,141 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <!-- struct hb_set_t -->
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-929'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-997'>
       <member-type access='public'>
         <!-- typedef uint32_t hb_set_t::elt_t -->
-        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1072'/>
+        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1067'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_set_t::header -->
@@ -13049,118 +13015,79 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- hb_set_t::elt_t hb_set_t::elts[2048] -->
-        <var-decl name='elts' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-1068' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const OT::AlternateSubst* -->
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-920'/>
+    <!-- const OT::Coverage -->
+    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-986'/>
+    <!-- const OT::Coverage& -->
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-999'/>
+    <!-- const OT::CoverageFormat1 -->
+    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-987'/>
+    <!-- const OT::CoverageFormat2 -->
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-988'/>
+    <!-- const OT::EncodingRecord& -->
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-924'/>
+    <!-- const OT::LigatureSubst* -->
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-966'/>
+    <!-- const OT::MultipleSubst* -->
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-969'/>
+    <!-- const OT::Record<OT::Feature>::sanitize_closure_t -->
+    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-989'/>
+    <!-- const OT::Record<OT::LangSys>::sanitize_closure_t -->
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-990'/>
+    <!-- const OT::Record<OT::Script>::sanitize_closure_t -->
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-991'/>
+    <!-- const OT::ReverseChainSingleSubst* -->
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-979'/>
+    <!-- const OT::SingleSubst* -->
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-981'/>
+    <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-992'/>
+    <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-993'/>
+    <!-- const OT::SubstLookup -->
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-994'/>
+    <!-- const OT::SubstLookupSubTable -->
+    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-995'/>
     <namespace-decl name='OT'>
       <!-- typedef OT::SHORT OT::FWORD -->
-      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-995'/>
+      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-983'/>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- typedef OT::USHORT OT::UFWORD -->
-      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-996'/>
+      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-984'/>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- typedef OT::IntType<unsigned int, 3u> OT::UINT24 -->
-      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-994'/>
+      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-982'/>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- typedef Value[1] OT::ValueRecord -->
-      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-984'/>
+      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-972'/>
     </namespace-decl>
     <!-- typedef hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > hb_set_digest_t -->
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-928'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-996'/>
     <!-- typedef const _hb_void_t& hb_void_t -->
     <typedef-decl name='hb_void_t' type-id='type-id-1076' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-998'/>
-    <!-- OT::hb_apply_context_t::matcher_t* -->
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1038'/>
-    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
-    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
     <!-- Value[1] -->
     <array-type-def dimensions='1' type-id='type-id-1077' size-in-bits='16' id='type-id-1074'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
+    <!-- OT::hb_apply_context_t::matcher_t* -->
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1033'/>
+    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
+    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <!-- bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* -->
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1037'/>
-    <!-- const OT::AlternateSubst -->
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-1010'/>
-    <!-- const OT::AlternateSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1050'/>
-    <!-- const OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1020'/>
-    <!-- const OT::ChainContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1056'/>
-    <!-- const OT::ChainContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1057'/>
-    <!-- const OT::ChainContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1058'/>
-    <!-- const OT::Context* -->
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1024'/>
-    <!-- const OT::ContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1053'/>
-    <!-- const OT::ContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-1054'/>
-    <!-- const OT::ContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1055'/>
-    <!-- const OT::CursivePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1059'/>
-    <!-- const OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1026'/>
-    <!-- const OT::GDEF& -->
-    <qualified-type-def type-id='type-id-1089' id='type-id-1046'/>
-    <!-- const OT::LigatureSubst -->
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1011'/>
-    <!-- const OT::LigatureSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-1052'/>
-    <!-- const OT::MarkBasePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1060'/>
-    <!-- const OT::MarkLigPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1061'/>
-    <!-- const OT::MarkMarkPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1062'/>
-    <!-- const OT::MultipleSubst -->
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1012'/>
-    <!-- const OT::MultipleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1049'/>
-    <!-- const OT::PairPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1065'/>
-    <!-- const OT::PairPosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1066'/>
-    <!-- const OT::ReverseChainSingleSubst -->
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1013'/>
-    <!-- const OT::ReverseChainSingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1051'/>
-    <!-- const OT::SinglePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1063'/>
-    <!-- const OT::SinglePosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1064'/>
-    <!-- const OT::SingleSubst -->
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-1014'/>
-    <!-- const OT::SingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1047'/>
-    <!-- const OT::SingleSubstFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1094' size-in-bits='64' id='type-id-1048'/>
-    <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1030'/>
-    <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1031'/>
-    <!-- const OT::SubstLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1027'/>
-    <!-- const OT::USHORT* -->
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1040'/>
-    <!-- const _hb_void_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1076'/>
-    <!-- elt_t[2048] -->
-    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
-      <!-- <anonymous range>[2048] -->
-      <subrange length='2048' type-id='type-id-4' id='type-id-1099'/>
-    </array-type-def>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1032'/>
     <namespace-decl name='OT'>
       <!-- struct OT::ChainContextFormat1 -->
-      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1017'>
+      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1012'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
@@ -13171,7 +13098,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat1::min_size -->
@@ -13181,7 +13108,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ChainContextFormat2 -->
-      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1018'>
+      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1013'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
@@ -13204,7 +13131,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat2::min_size -->
@@ -13214,26 +13141,26 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ChainContextFormat3 -->
-      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1019'>
+      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1014'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::inputX -->
-          <var-decl name='inputX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat3::lookupX -->
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat3::min_size -->
@@ -13268,7 +13195,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ContextFormat1 -->
-      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1022'>
+      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1017'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
@@ -13279,7 +13206,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat1::min_size -->
@@ -13289,7 +13216,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::ContextFormat2 -->
-      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1023'>
+      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1018'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
@@ -13304,7 +13231,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat2::min_size -->
@@ -13349,7 +13276,7 @@
       <class-decl name='IntType&lt;unsigned int, 3u&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<unsigned int, 3> OT::IntType<unsigned int, 3u>::v -->
-          <var-decl name='v' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-1081' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 3u>::static_size -->
@@ -13384,23 +13311,23 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1015'>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1010'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-804'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-855'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::Coverage> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1029'>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1024'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-808'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-859'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::Sequence> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1028'>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1023'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-868'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
@@ -13408,11 +13335,11 @@
       <class-decl name='RangeRecord' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::RangeRecord::start -->
-          <var-decl name='start' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::RangeRecord::end -->
-          <var-decl name='end' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::RangeRecord::value -->
@@ -13430,9 +13357,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -13441,9 +13368,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -13455,11 +13382,11 @@
       <class-decl name='UVSMapping' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-1008'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UVSMapping::unicodeValue -->
-          <var-decl name='unicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::GlyphID OT::UVSMapping::glyphID -->
-          <var-decl name='glyphID' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UVSMapping::static_size -->
@@ -13476,7 +13403,7 @@
       <class-decl name='UnicodeValueRange' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UnicodeValueRange::startUnicodeValue -->
-          <var-decl name='startUnicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::BYTE OT::UnicodeValueRange::additionalCount -->
@@ -13496,103 +13423,134 @@
     <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1075'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::head -->
-        <var-decl name='head' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1083' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::tail -->
-        <var-decl name='tail' type-id='type-id-1105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1084' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const OT::AlternateSubst -->
+    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1069'/>
+    <!-- const OT::AlternateSubstFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1045'/>
+    <!-- const OT::ChainContext* -->
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1015'/>
+    <!-- const OT::ChainContextFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1051'/>
+    <!-- const OT::ChainContextFormat2& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1088' size-in-bits='64' id='type-id-1052'/>
+    <!-- const OT::ChainContextFormat3& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-1053'/>
+    <!-- const OT::Context* -->
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1019'/>
+    <!-- const OT::ContextFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1048'/>
+    <!-- const OT::ContextFormat2& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1049'/>
+    <!-- const OT::ContextFormat3& -->
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1050'/>
+    <!-- const OT::CursivePosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1054'/>
+    <!-- const OT::Extension<OT::ExtensionSubst>* -->
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1021'/>
+    <!-- const OT::GDEF& -->
+    <qualified-type-def type-id='type-id-1095' id='type-id-1041'/>
+    <!-- const OT::LigatureSubst -->
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-1070'/>
+    <!-- const OT::LigatureSubstFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1047'/>
+    <!-- const OT::MarkBasePosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1055'/>
+    <!-- const OT::MarkLigPosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1056'/>
+    <!-- const OT::MarkMarkPosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1057'/>
+    <!-- const OT::MultipleSubst -->
+    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-1071'/>
+    <!-- const OT::MultipleSubstFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-1044'/>
+    <!-- const OT::PairPosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1060'/>
+    <!-- const OT::PairPosFormat2& -->
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1061'/>
+    <!-- const OT::ReverseChainSingleSubst -->
+    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-1072'/>
+    <!-- const OT::ReverseChainSingleSubstFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1046'/>
+    <!-- const OT::SinglePosFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1058'/>
+    <!-- const OT::SinglePosFormat2& -->
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1059'/>
+    <!-- const OT::SingleSubst -->
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-1073'/>
+    <!-- const OT::SingleSubstFormat1& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1042'/>
+    <!-- const OT::SingleSubstFormat2& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-1043'/>
+    <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1025'/>
+    <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1026'/>
+    <!-- const OT::SubstLookupSubTable& -->
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-1022'/>
+    <!-- const OT::USHORT* -->
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1035'/>
+    <!-- const _hb_void_t& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-1076'/>
+    <!-- elt_t[2048] -->
+    <array-type-def dimensions='1' type-id='type-id-1067' size-in-bits='65536' id='type-id-1068'>
+      <!-- <anonymous range>[2048] -->
+      <subrange length='2048' type-id='type-id-4' id='type-id-1105'/>
+    </array-type-def>
     <namespace-decl name='OT'>
       <!-- typedef uint8_t OT::BYTE -->
       <typedef-decl name='BYTE' type-id='type-id-84' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-1000'/>
     </namespace-decl>
     <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1040'/>
     <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1063'/>
     <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1070'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1065'/>
     <!-- typedef hb_set_t hb_set_t -->
-    <typedef-decl name='hb_set_t' type-id='type-id-929' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1071'/>
-    <!-- const OT::AlternateSubstFormat1 -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1079'/>
-    <!-- const OT::ChainContext -->
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1080'/>
-    <!-- const OT::ChainContextFormat1 -->
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1081'/>
-    <!-- const OT::ChainContextFormat2 -->
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1082'/>
-    <!-- const OT::ChainContextFormat3 -->
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1083'/>
-    <!-- const OT::Context -->
-    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1084'/>
-    <!-- const OT::ContextFormat1 -->
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1085'/>
-    <!-- const OT::ContextFormat2 -->
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1086'/>
-    <!-- const OT::CursivePosFormat1 -->
-    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1087'/>
-    <!-- const OT::Extension<OT::ExtensionSubst> -->
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1088'/>
-    <!-- const OT::GDEF& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1089'/>
-    <!-- const OT::LigatureSubstFormat1 -->
-    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1090'/>
-    <!-- const OT::MultipleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1091'/>
-    <!-- const OT::RangeRecord* -->
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1103'/>
-    <!-- const OT::ReverseChainSingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1092'/>
-    <!-- const OT::SingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1093'/>
-    <!-- const OT::SingleSubstFormat2 -->
-    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1094'/>
-    <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1095'/>
-    <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1096'/>
-    <!-- const OT::USHORT -->
-    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1097'/>
-    <!-- const _hb_void_t -->
-    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1098'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-997' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1066'/>
     <namespace-decl name='OT'>
       <!-- struct OT::BEInt<unsigned int, 3> -->
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1102'>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1081'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<unsigned int, 3>::v[3] -->
-          <var-decl name='v' type-id='type-id-1113' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::ChainRuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1100'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1079'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-858'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <!-- struct OT::OffsetArrayOf<OT::RuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1101'>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1080'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-816'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
       </class-decl>
     </namespace-decl>
     <!-- struct hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1105'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1084'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::head -->
-        <var-decl name='head' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1110' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::tail -->
-        <var-decl name='tail' type-id='type-id-1115' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1111' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1104'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1083'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -13610,17 +13568,55 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const OT::AlternateSubstFormat1 -->
+    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1085'/>
+    <!-- const OT::ChainContext -->
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1086'/>
+    <!-- const OT::ChainContextFormat1 -->
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1087'/>
+    <!-- const OT::ChainContextFormat2 -->
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1088'/>
+    <!-- const OT::ChainContextFormat3 -->
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1089'/>
+    <!-- const OT::Context -->
+    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1090'/>
+    <!-- const OT::ContextFormat1 -->
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1091'/>
+    <!-- const OT::ContextFormat2 -->
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1092'/>
+    <!-- const OT::CursivePosFormat1 -->
+    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1093'/>
+    <!-- const OT::Extension<OT::ExtensionSubst> -->
+    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-1094'/>
+    <!-- const OT::GDEF& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1113' size-in-bits='64' id='type-id-1095'/>
+    <!-- const OT::LigatureSubstFormat1 -->
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1096'/>
+    <!-- const OT::MultipleSubstFormat1 -->
+    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-1097'/>
+    <!-- const OT::RangeRecord* -->
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1082'/>
+    <!-- const OT::ReverseChainSingleSubstFormat1 -->
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1098'/>
+    <!-- const OT::SingleSubstFormat1 -->
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1099'/>
+    <!-- const OT::SingleSubstFormat2 -->
+    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1100'/>
+    <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-1101'/>
+    <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1102'/>
+    <!-- const OT::USHORT -->
+    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1103'/>
+    <!-- const _hb_void_t -->
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1104'/>
     <namespace-decl name='OT'>
       <!-- typedef OT::USHORT OT::Value -->
       <typedef-decl name='Value' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-1077'/>
     </namespace-decl>
-    <!-- const OT::GDEF -->
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1110'/>
-    <!-- const OT::RangeRecord -->
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1111'/>
     <namespace-decl name='OT'>
       <!-- struct OT::CursivePosFormat1 -->
-      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1109'>
+      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1112'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CursivePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
@@ -13631,7 +13627,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > OT::CursivePosFormat1::entryExitRecord -->
-          <var-decl name='entryExitRecord' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CursivePosFormat1::min_size -->
@@ -13640,9 +13636,9 @@
       </class-decl>
     </namespace-decl>
     <!-- struct _hb_void_t -->
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1112'/>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1115'/>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1114'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1110'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -13661,7 +13657,7 @@
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1115'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1111'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -13679,8 +13675,12 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const OT::GDEF -->
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1113'/>
+    <!-- const OT::RangeRecord -->
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1114'/>
     <!-- uint8_t[3] -->
-    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1113'>
+    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1109'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-1117'/>
     </array-type-def>
@@ -15115,6 +15115,18 @@
       <!-- hb_face_t* -->
       <return type-id='type-id-144'/>
     </function-decl>
+    <!-- struct FT_DriverRec_ -->
+    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1204'/>
+    <!-- struct FT_Face_InternalRec_ -->
+    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1205'/>
+    <!-- struct FT_LibraryRec_ -->
+    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'/>
+    <!-- struct FT_Size_InternalRec_ -->
+    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1207'/>
+    <!-- struct FT_Slot_InternalRec_ -->
+    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'/>
+    <!-- struct FT_SubGlyphRec_ -->
+    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
     <!-- unsigned long int (FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <function-type size-in-bits='64' id='type-id-1210'>
       <!-- parameter of type 'typedef FT_Stream' -->
@@ -15166,18 +15178,6 @@
       <!-- void* -->
       <return type-id='type-id-33'/>
     </function-type>
-    <!-- struct FT_DriverRec_ -->
-    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1204'/>
-    <!-- struct FT_Face_InternalRec_ -->
-    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1205'/>
-    <!-- struct FT_LibraryRec_ -->
-    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'/>
-    <!-- struct FT_Size_InternalRec_ -->
-    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1207'/>
-    <!-- struct FT_Slot_InternalRec_ -->
-    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'/>
-    <!-- struct FT_SubGlyphRec_ -->
-    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- enum GUnicodeScript -->
@@ -15333,22 +15333,22 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- BYTE[256] -->
-    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
+    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-959'>
       <!-- <anonymous range>[256] -->
       <subrange length='256' type-id='type-id-4' id='type-id-1001'/>
     </array-type-def>
     <!-- CmapSubtableLongGroup[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-934'>
+    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-922'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- EncodingRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='64' id='type-id-935'>
+    <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='64' id='type-id-923'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- IntType<short unsigned int, 2u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-862'>
+    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-791'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
@@ -15363,27 +15363,27 @@
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- USHORT[1] -->
-    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-880'>
+    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-809'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- UVSMapping[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-967'>
+    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-955'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-968'>
+    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-956'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- VariationSelectorRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='88' id='type-id-969'>
+    <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='88' id='type-id-957'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- uint8_t[3] -->
-    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1113'>
+    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1109'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-1117'/>
     </array-type-def>
@@ -15426,11 +15426,11 @@
       </data-member>
     </class-decl>
     <!-- OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1223'/>
     <!-- OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1224'/>
     <!-- OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-796' size-in-bits='64' id='type-id-1225'/>
+    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-1225'/>
     <!-- OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1226'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
@@ -15438,25 +15438,25 @@
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-437' const='yes' id='type-id-1227'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-1228'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1228' const='yes' id='type-id-1229'/>
     <!-- OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-1230'/>
+    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-1230'/>
     <!-- OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1231'/>
     <!-- OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-1232'/>
+    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-1232'/>
     <!-- OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
     <!-- OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-1234'/>
+    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-1234'/>
     <!-- OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1235'/>
     <!-- OT::BEInt<short unsigned int, 2>* const -->
     <qualified-type-def type-id='type-id-267' const='yes' id='type-id-1236'/>
     <!-- OT::BEInt<unsigned int, 3>* -->
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1237'/>
     <!-- OT::CmapSubtable& -->
     <reference-type-def kind='lvalue' type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
     <!-- OT::CmapSubtable* -->
@@ -15464,15 +15464,15 @@
     <!-- OT::CmapSubtable* const -->
     <qualified-type-def type-id='type-id-1240' const='yes' id='type-id-1241'/>
     <!-- OT::CmapSubtableFormat0* -->
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-1242'/>
     <!-- OT::CmapSubtableFormat0* const -->
     <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1243'/>
     <!-- OT::CmapSubtableFormat14* -->
-    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-1244'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-1244'/>
     <!-- OT::CmapSubtableFormat14* const -->
     <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1245'/>
     <!-- OT::CmapSubtableFormat4* -->
-    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1246'/>
+    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-1246'/>
     <!-- OT::CmapSubtableFormat4* const -->
     <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1247'/>
     <!-- OT::CmapSubtableLongGroup& -->
@@ -15480,25 +15480,25 @@
     <!-- OT::CmapSubtableLongGroup* -->
     <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1249'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* -->
-    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-1250'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-1250'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* const -->
     <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* -->
-    <pointer-type-def type-id='type-id-835' size-in-bits='64' id='type-id-1252'/>
+    <pointer-type-def type-id='type-id-885' size-in-bits='64' id='type-id-1252'/>
     <!-- OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* const -->
     <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1253'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1254'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1254'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1255'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1256'/>
+    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-1256'/>
     <!-- OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-1256' const='yes' id='type-id-1257'/>
     <!-- OT::EncodingRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1258'/>
+    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1258'/>
     <!-- OT::EncodingRecord* -->
-    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-1259'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1259'/>
     <!-- OT::EncodingRecord* const -->
     <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1260'/>
     <!-- OT::IntType<short unsigned int, 2u>& -->
@@ -15546,13 +15546,13 @@
     <!-- OT::UnicodeValueRange* -->
     <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1286'/>
     <!-- OT::VariationSelectorRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-859' size-in-bits='64' id='type-id-1287'/>
+    <reference-type-def kind='lvalue' type-id='type-id-909' size-in-bits='64' id='type-id-1287'/>
     <!-- OT::VariationSelectorRecord* -->
-    <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-1288'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-1288'/>
     <!-- OT::VariationSelectorRecord* const -->
     <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1289'/>
     <!-- OT::_hea* -->
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1290'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1290'/>
     <!-- OT::_hea* const -->
     <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1291'/>
     <!-- OT::_mtx* -->
@@ -15560,17 +15560,17 @@
     <!-- OT::_mtx* const -->
     <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1294'/>
     <!-- OT::cmap* -->
-    <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-1295'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-1295'/>
     <!-- OT::cmap* const -->
     <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1296'/>
     <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-679'/>
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-679'/>
     <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-466'/>
     <!-- const OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-466' const='yes' id='type-id-1297'/>
     <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-680'/>
+    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-680'/>
     <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-458'/>
     <!-- const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >* const -->
@@ -15582,29 +15582,29 @@
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-462' const='yes' id='type-id-1299'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-684'/>
+    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-684'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-464'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-464' const='yes' id='type-id-1300'/>
     <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-712'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-712'/>
     <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-472'/>
     <!-- const OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-472' const='yes' id='type-id-1301'/>
     <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-713'/>
+    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-713'/>
     <!-- const OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-470'/>
     <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-714'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-714'/>
     <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-469'/>
     <!-- const OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-469' const='yes' id='type-id-1302'/>
     <!-- const OT::BEInt<unsigned int, 3> -->
-    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1303'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1303'/>
     <!-- const OT::BEInt<unsigned int, 3>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1304'/>
     <!-- const OT::BEInt<unsigned int, 3>* -->
@@ -15620,19 +15620,19 @@
     <!-- const OT::CmapSubtable* const -->
     <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1309'/>
     <!-- const OT::CmapSubtableFormat0 -->
-    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-719'/>
+    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-719'/>
     <!-- const OT::CmapSubtableFormat0* -->
     <pointer-type-def type-id='type-id-719' size-in-bits='64' id='type-id-459'/>
     <!-- const OT::CmapSubtableFormat0* const -->
     <qualified-type-def type-id='type-id-459' const='yes' id='type-id-1310'/>
     <!-- const OT::CmapSubtableFormat14 -->
-    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-720'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-720'/>
     <!-- const OT::CmapSubtableFormat14* -->
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-475'/>
     <!-- const OT::CmapSubtableFormat14* const -->
     <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1311'/>
     <!-- const OT::CmapSubtableFormat4 -->
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-721'/>
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-721'/>
     <!-- const OT::CmapSubtableFormat4* -->
     <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-460'/>
     <!-- const OT::CmapSubtableFormat4* const -->
@@ -15648,35 +15648,35 @@
     <!-- const OT::CmapSubtableLongGroup* const -->
     <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1317'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-722'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-722'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* -->
     <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-467'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>* const -->
     <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1318'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-    <qualified-type-def type-id='type-id-835' const='yes' id='type-id-723'/>
+    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-723'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* -->
     <pointer-type-def type-id='type-id-723' size-in-bits='64' id='type-id-468'/>
     <!-- const OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>* const -->
     <qualified-type-def type-id='type-id-468' const='yes' id='type-id-1319'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-724'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-724'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-463'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-463' const='yes' id='type-id-1320'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-725'/>
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-725'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-465'/>
     <!-- const OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-465' const='yes' id='type-id-1321'/>
     <!-- const OT::EncodingRecord -->
-    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-728'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-728'/>
     <!-- const OT::EncodingRecord& -->
-    <qualified-type-def type-id='type-id-936' id='type-id-1322'/>
+    <qualified-type-def type-id='type-id-924' id='type-id-1322'/>
     <!-- const OT::EncodingRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-936'/>
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-924'/>
     <!-- const OT::EncodingRecord* -->
     <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-477'/>
     <!-- const OT::EncodingRecord* const -->
@@ -15712,9 +15712,9 @@
     <!-- const OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >* const -->
     <qualified-type-def type-id='type-id-471' const='yes' id='type-id-1332'/>
     <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1095'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-1101'/>
     <!-- const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1030'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1025'/>
     <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
     <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1333'/>
     <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& -->
@@ -15728,9 +15728,9 @@
     <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >* -->
     <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1338'/>
     <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1102'/>
     <!-- const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1026'/>
     <!-- const OT::UVSMapping -->
     <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1339'/>
     <!-- const OT::UVSMapping& -->
@@ -15748,7 +15748,7 @@
     <!-- const OT::UnicodeValueRange* const -->
     <qualified-type-def type-id='type-id-1345' const='yes' id='type-id-1346'/>
     <!-- const OT::VariationSelectorRecord -->
-    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-788'/>
     <!-- const OT::VariationSelectorRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1347'/>
     <!-- const OT::VariationSelectorRecord* -->
@@ -15756,7 +15756,7 @@
     <!-- const OT::VariationSelectorRecord* const -->
     <qualified-type-def type-id='type-id-474' const='yes' id='type-id-1348'/>
     <!-- const OT::_hea -->
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-789'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-789'/>
     <!-- const OT::_hea* -->
     <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-479'/>
     <!-- const OT::_mtx -->
@@ -15764,15 +15764,15 @@
     <!-- const OT::_mtx* -->
     <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1222'/>
     <!-- const OT::cmap -->
-    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-790'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-790'/>
     <!-- const OT::cmap* -->
     <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-478'/>
     <!-- const OT::cmap* const -->
     <qualified-type-def type-id='type-id-478' const='yes' id='type-id-1350'/>
     <!-- const hb_codepoint_t& -->
-    <qualified-type-def type-id='type-id-887' id='type-id-1351'/>
+    <qualified-type-def type-id='type-id-816' id='type-id-1351'/>
     <!-- const hb_codepoint_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-887'/>
+    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-816'/>
     <!-- const hb_ot_face_cmap_accelerator_t -->
     <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1352'/>
     <!-- const hb_ot_face_cmap_accelerator_t* -->
@@ -15837,7 +15837,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat0 -->
-      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-831'>
+      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-881'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat0::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
@@ -15852,7 +15852,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::BYTE OT::CmapSubtableFormat0::glyphIdArray[256] -->
-          <var-decl name='glyphIdArray' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat0::static_size -->
@@ -15866,7 +15866,7 @@
       <!-- typedef uint8_t OT::BYTE -->
       <typedef-decl name='BYTE' type-id='type-id-84' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-1000'/>
       <!-- struct OT::CmapSubtableFormat4 -->
-      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-833'>
+      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-883'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
@@ -15897,7 +15897,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::USHORT OT::CmapSubtableFormat4::values[1] -->
-          <var-decl name='values' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat4::min_size -->
@@ -15907,10 +15907,10 @@
       <!-- struct OT::CmapSubtableFormat6 -->
       <class-decl name='CmapSubtableFormat6' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-1362'>
         <!-- struct OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-836'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-886'/>
       </class-decl>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-836'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-886'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::formatReserved -->
           <var-decl name='formatReserved' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
@@ -15939,10 +15939,10 @@
       <!-- struct OT::CmapSubtableFormat10 -->
       <class-decl name='CmapSubtableFormat10' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-1363'>
         <!-- struct OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-837'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-887'/>
       </class-decl>
       <!-- struct OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-837'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-887'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::formatReserved -->
           <var-decl name='formatReserved' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
@@ -15961,7 +15961,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::glyphIdArray -->
-          <var-decl name='glyphIdArray' type-id='type-id-799' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::min_size -->
@@ -15969,14 +15969,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-799'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-850'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -15986,10 +15986,10 @@
       <!-- struct OT::CmapSubtableFormat12 -->
       <class-decl name='CmapSubtableFormat12' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-1364'>
         <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-834'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-884'/>
       </class-decl>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-834'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-884'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
@@ -16008,7 +16008,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::groups -->
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::min_size -->
@@ -16016,30 +16016,30 @@
         </data-member>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-973'>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-961'>
         <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
+            <parameter type-id='type-id-1025' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-795'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-846'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::CmapSubtableLongGroup OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-922' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -16072,10 +16072,10 @@
       <!-- struct OT::CmapSubtableFormat13 -->
       <class-decl name='CmapSubtableFormat13' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-1365'>
         <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-835'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-885'/>
       </class-decl>
       <!-- struct OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13> -->
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-835'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-885'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
@@ -16094,7 +16094,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::SortedArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> > OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::groups -->
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::min_size -->
@@ -16102,7 +16102,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::CmapSubtableFormat14 -->
-      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-832'>
+      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-882'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CmapSubtableFormat14::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
@@ -16113,7 +16113,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > OT::CmapSubtableFormat14::record -->
-          <var-decl name='record' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat14::min_size -->
@@ -16121,30 +16121,30 @@
         </data-member>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-972'>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-960'>
         <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-826'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-876'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >*' -->
-            <parameter type-id='type-id-1031' is-artificial='yes'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-826'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-876'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::VariationSelectorRecord OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -16152,10 +16152,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::VariationSelectorRecord -->
-      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-859'>
+      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-909'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::VariationSelectorRecord::varSelector -->
-          <var-decl name='varSelector' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > OT::VariationSelectorRecord::defaultUVS -->
@@ -16175,12 +16175,12 @@
         </data-member>
       </class-decl>
       <!-- typedef OT::IntType<unsigned int, 3u> OT::UINT24 -->
-      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-994'/>
+      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-982'/>
       <!-- struct OT::BEInt<unsigned int, 3> -->
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1102'>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1081'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<unsigned int, 3>::v[3] -->
-          <var-decl name='v' type-id='type-id-1113' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
@@ -16191,7 +16191,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -16216,11 +16216,11 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::CmapSubtableFormat0 format0 -->
-              <var-decl name='format0' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
+              <var-decl name='format0' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::CmapSubtableFormat4 format4 -->
-              <var-decl name='format4' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
+              <var-decl name='format4' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::CmapSubtableFormat6 format6 -->
@@ -16240,7 +16240,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::CmapSubtableFormat14 format14 -->
-              <var-decl name='format14' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
+              <var-decl name='format14' type-id='type-id-882' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16254,14 +16254,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-796'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-847'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EncodingRecord OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -16273,14 +16273,14 @@
             <!-- implicit parameter of type 'const OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >*' -->
             <parameter type-id='type-id-458' is-artificial='yes'/>
             <!-- parameter of type 'const OT::EncodingRecord&' -->
-            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-924'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::EncodingRecord -->
-      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-840'>
+      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-890'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::EncodingRecord::platformID -->
           <var-decl name='platformID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
@@ -16303,14 +16303,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-825'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-875'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UnicodeValueRange OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -16321,7 +16321,7 @@
       <class-decl name='UnicodeValueRange' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UnicodeValueRange::startUnicodeValue -->
-          <var-decl name='startUnicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::BYTE OT::UnicodeValueRange::additionalCount -->
@@ -16337,14 +16337,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-824'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-874'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<unsigned int, 4u> OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::len -->
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::UVSMapping OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::min_size -->
@@ -16355,11 +16355,11 @@
       <class-decl name='UVSMapping' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-1008'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::UINT24 OT::UVSMapping::unicodeValue -->
-          <var-decl name='unicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <!-- OT::GlyphID OT::UVSMapping::glyphID -->
-          <var-decl name='glyphID' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UVSMapping::static_size -->
@@ -16371,12 +16371,12 @@
         </data-member>
       </class-decl>
       <!-- typedef OT::USHORT OT::GlyphID -->
-      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-877'/>
+      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-806'/>
       <!-- struct OT::IntType<unsigned int, 3u> -->
       <class-decl name='IntType&lt;unsigned int, 3u&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::BEInt<unsigned int, 3> OT::IntType<unsigned int, 3u>::v -->
-          <var-decl name='v' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-1081' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 3u>::static_size -->
@@ -16388,7 +16388,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::cmap -->
-      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-861'>
+      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-911'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::cmap::tableTag -->
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
@@ -16399,7 +16399,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > OT::cmap::encodingRecord -->
-          <var-decl name='encodingRecord' type-id='type-id-997' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::cmap::min_size -->
@@ -16407,12 +16407,12 @@
         </data-member>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-997'>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-985'>
         <!-- struct OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-796'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-847'/>
       </class-decl>
       <!-- struct OT::_hea -->
-      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-860'>
+      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-910'>
         <data-member access='public' static='yes'>
           <!-- static const hb_tag_t OT::_hea::tableTag -->
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
@@ -16431,31 +16431,31 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::FWORD OT::_hea::ascender -->
-          <var-decl name='ascender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
           <!-- OT::FWORD OT::_hea::descender -->
-          <var-decl name='descender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::FWORD OT::_hea::lineGap -->
-          <var-decl name='lineGap' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
           <!-- OT::UFWORD OT::_hea::advanceMax -->
-          <var-decl name='advanceMax' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::FWORD OT::_hea::minLeadingBearing -->
-          <var-decl name='minLeadingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
           <!-- OT::FWORD OT::_hea::minTrailingBearing -->
-          <var-decl name='minTrailingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::FWORD OT::_hea::maxExtent -->
-          <var-decl name='maxExtent' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
           <!-- OT::SHORT OT::_hea::caretSlopeRise -->
@@ -16503,20 +16503,20 @@
         </data-member>
       </class-decl>
       <!-- typedef OT::SHORT OT::FWORD -->
-      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-995'/>
+      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-983'/>
       <!-- typedef OT::USHORT OT::UFWORD -->
-      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-996'/>
+      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-984'/>
       <!-- struct OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
       <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1269'>
         <!-- struct OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-825'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-875'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >*' -->
             <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -16525,14 +16525,14 @@
       <!-- struct OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
       <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1267'>
         <!-- struct OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-824'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-874'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >*' -->
             <parameter type-id='type-id-1335' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -16652,92 +16652,92 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- EntryExitRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
+    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-925'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Index[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-938'>
+    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-926'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-939'>
+    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-927'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- LookupRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-940'>
+    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-928'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- MarkRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-850' size-in-bits='32' id='type-id-941'>
+    <array-type-def dimensions='1' type-id='type-id-900' size-in-bits='32' id='type-id-929'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-863'>
+    <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='16' id='type-id-792'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-933'>
+    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-921'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-942'>
+    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-930'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-944'>
+    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-932'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-945'>
+    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-933'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-946'>
+    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-934'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-947'>
+    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-935'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-948'>
+    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-936'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-949'>
+    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-937'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-950'>
+    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-938'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-864'>
+    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-793'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-865'>
+    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-794'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-951'>
+    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-939'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
@@ -16747,62 +16747,62 @@
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-952'>
+    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-940'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-954'>
+    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-942'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-955'>
+    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-943'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-957'>
+    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-945'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-958'>
+    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-946'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-959'>
+    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-947'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-960'>
+    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-948'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
-    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-961'>
+    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-949'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- RangeRecord[1] -->
-    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-963'>
+    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-951'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-854' size-in-bits='48' id='type-id-964'>
+    <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='48' id='type-id-952'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='48' id='type-id-965'>
+    <array-type-def dimensions='1' type-id='type-id-905' size-in-bits='48' id='type-id-953'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
-    <array-type-def dimensions='1' type-id='type-id-856' size-in-bits='48' id='type-id-966'>
+    <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='48' id='type-id-954'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
@@ -17112,7 +17112,7 @@
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1114'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1110'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -17131,7 +17131,7 @@
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1115'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1111'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -17150,7 +17150,7 @@
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1104'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1083'>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::mask_bytes -->
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
@@ -17169,27 +17169,27 @@
       </data-member>
     </class-decl>
     <!-- struct hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1105'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1084'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::head -->
-        <var-decl name='head' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1110' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >::tail -->
-        <var-decl name='tail' type-id='type-id-1115' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1111' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > hb_set_digest_t -->
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-928'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-996'/>
     <!-- struct hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > -->
     <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1075'>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u> hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::head -->
-        <var-decl name='head' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1083' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >::tail -->
-        <var-decl name='tail' type-id='type-id-1105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1084' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_auto_trace_t<0, const OT::Coverage&> -->
@@ -17219,7 +17219,7 @@
     <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-1407'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_set_digest_t hb_ot_layout_lookup_accelerator_t::digest -->
-        <var-decl name='digest' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
+        <var-decl name='digest' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_ot_layout_lookup_accelerator_t::fini<OT::SubstLookup>(const OT::SubstLookup&) -->
@@ -17280,7 +17280,7 @@
     <!-- typedef const _hb_void_t& hb_void_t -->
     <typedef-decl name='hb_void_t' type-id='type-id-1076' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-998'/>
     <!-- struct _hb_void_t -->
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1112'/>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1115'/>
     <!-- struct hb_auto_trace_t<0, const _hb_void_t&> -->
     <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-1412'>
       <member-function access='public'>
@@ -17386,11 +17386,11 @@
     <!-- GSUBProxy* -->
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-1419'/>
     <!-- OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1426'/>
     <!-- OT::AlternateSubst* const -->
     <qualified-type-def type-id='type-id-1426' const='yes' id='type-id-1427'/>
     <!-- OT::AlternateSubstFormat1* -->
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-1428'/>
     <!-- OT::AlternateSubstFormat1* const -->
     <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1429'/>
     <!-- OT::Anchor& -->
@@ -17400,43 +17400,43 @@
     <!-- OT::Anchor* const -->
     <qualified-type-def type-id='type-id-1432' const='yes' id='type-id-1433'/>
     <!-- OT::AnchorFormat1* -->
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-1434'/>
     <!-- OT::AnchorFormat1* const -->
     <qualified-type-def type-id='type-id-1434' const='yes' id='type-id-1435'/>
     <!-- OT::AnchorFormat2* -->
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-1436'/>
     <!-- OT::AnchorFormat2* const -->
     <qualified-type-def type-id='type-id-1436' const='yes' id='type-id-1437'/>
     <!-- OT::AnchorFormat3* -->
-    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-1438'/>
     <!-- OT::AnchorFormat3* const -->
     <qualified-type-def type-id='type-id-1438' const='yes' id='type-id-1439'/>
     <!-- OT::AnchorMatrix& -->
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1440'/>
+    <reference-type-def kind='lvalue' type-id='type-id-845' size-in-bits='64' id='type-id-1440'/>
     <!-- OT::AnchorMatrix* -->
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1441'/>
+    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-1441'/>
     <!-- OT::AnchorMatrix* const -->
     <qualified-type-def type-id='type-id-1441' const='yes' id='type-id-1442'/>
     <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1443'/>
     <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1443' const='yes' id='type-id-1444'/>
     <!-- OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-1445'/>
+    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1445'/>
     <!-- OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1445' const='yes' id='type-id-1446'/>
     <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-618' size-in-bits='64' id='type-id-438'/>
     <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1447'/>
     <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1447' const='yes' id='type-id-1448'/>
     <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-1449'/>
+    <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-1449'/>
     <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1449' const='yes' id='type-id-1450'/>
     <!-- OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-1451'/>
+    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1451'/>
     <!-- OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1451' const='yes' id='type-id-1452'/>
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
@@ -17444,35 +17444,35 @@
     <!-- OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-422' const='yes' id='type-id-1453'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-931'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
-    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1454'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1454'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-804' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1455'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1455' const='yes' id='type-id-1456'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1457'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1457' const='yes' id='type-id-1458'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1459'/>
+    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1459'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1459' const='yes' id='type-id-1460'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1461'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1461' const='yes' id='type-id-1462'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-808' size-in-bits='64' id='type-id-1463'/>
+    <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-1463'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1463' const='yes' id='type-id-1464'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-1465'/>
+    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1465'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1465' const='yes' id='type-id-1466'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-1467'/>
+    <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-1467'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1467' const='yes' id='type-id-1468'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
@@ -17484,55 +17484,55 @@
     <!-- OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-441' const='yes' id='type-id-1470'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-1471'/>
+    <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-1471'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1471' const='yes' id='type-id-1472'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-953'/>
+    <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-941'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
-    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1473'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1473'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-1474'/>
+    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-1474'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1474' const='yes' id='type-id-1475'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-956'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-944'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
-    <qualified-type-def type-id='type-id-956' const='yes' id='type-id-1476'/>
+    <qualified-type-def type-id='type-id-944' const='yes' id='type-id-1476'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1477'/>
+    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1477'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1477' const='yes' id='type-id-1478'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-816' size-in-bits='64' id='type-id-1479'/>
+    <pointer-type-def type-id='type-id-867' size-in-bits='64' id='type-id-1479'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1481'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1482'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-1483'/>
+    <pointer-type-def type-id='type-id-869' size-in-bits='64' id='type-id-1483'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1483' const='yes' id='type-id-1484'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-950'/>
     <!-- OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
-    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1485'/>
     <!-- OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-1486'/>
     <!-- OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1486' const='yes' id='type-id-1487'/>
     <!-- OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-871' size-in-bits='64' id='type-id-1488'/>
     <!-- OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-1489'/>
     <!-- OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-1490'/>
     <!-- OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1490' const='yes' id='type-id-1491'/>
     <!-- OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-873' size-in-bits='64' id='type-id-1492'/>
     <!-- OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1493'/>
     <!-- OT::AttachList& -->
@@ -17548,19 +17548,19 @@
     <!-- OT::CaretValue* const -->
     <qualified-type-def type-id='type-id-1500' const='yes' id='type-id-1501'/>
     <!-- OT::CaretValueFormat1* -->
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-1502'/>
     <!-- OT::CaretValueFormat1* const -->
     <qualified-type-def type-id='type-id-1502' const='yes' id='type-id-1503'/>
     <!-- OT::CaretValueFormat2* -->
-    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-1504'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-1504'/>
     <!-- OT::CaretValueFormat2* const -->
     <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-1505'/>
     <!-- OT::CaretValueFormat3* -->
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-1506'/>
+    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-1506'/>
     <!-- OT::CaretValueFormat3* const -->
     <qualified-type-def type-id='type-id-1506' const='yes' id='type-id-1507'/>
     <!-- OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-1508'/>
     <!-- OT::ChainContext* const -->
     <qualified-type-def type-id='type-id-1508' const='yes' id='type-id-1509'/>
     <!-- OT::ChainContextApplyLookupContext& -->
@@ -17576,15 +17576,15 @@
     <!-- OT::ChainContextCollectGlyphsLookupContext& -->
     <reference-type-def kind='lvalue' type-id='type-id-1518' size-in-bits='64' id='type-id-1516'/>
     <!-- OT::ChainContextFormat1* -->
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1519'/>
     <!-- OT::ChainContextFormat1* const -->
     <qualified-type-def type-id='type-id-1519' const='yes' id='type-id-1520'/>
     <!-- OT::ChainContextFormat2* -->
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1521'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1521'/>
     <!-- OT::ChainContextFormat2* const -->
     <qualified-type-def type-id='type-id-1521' const='yes' id='type-id-1522'/>
     <!-- OT::ChainContextFormat3* -->
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1523'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1523'/>
     <!-- OT::ChainContextFormat3* const -->
     <qualified-type-def type-id='type-id-1523' const='yes' id='type-id-1524'/>
     <!-- OT::ChainRule& -->
@@ -17606,7 +17606,7 @@
     <!-- OT::ClassDef* const -->
     <qualified-type-def type-id='type-id-1535' const='yes' id='type-id-1536'/>
     <!-- OT::ClassDefFormat1* -->
-    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-1537'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-1537'/>
     <!-- OT::ClassDefFormat1* const -->
     <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1538'/>
     <!-- OT::ClassDefFormat2* -->
@@ -17614,7 +17614,7 @@
     <!-- OT::ClassDefFormat2* const -->
     <qualified-type-def type-id='type-id-1540' const='yes' id='type-id-1541'/>
     <!-- OT::Context* -->
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-1542'/>
+    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-1542'/>
     <!-- OT::Context* const -->
     <qualified-type-def type-id='type-id-1542' const='yes' id='type-id-1543'/>
     <!-- OT::ContextApplyLookupContext& -->
@@ -17630,15 +17630,15 @@
     <!-- OT::ContextCollectGlyphsLookupContext& -->
     <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1550'/>
     <!-- OT::ContextFormat1* -->
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1553'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1553'/>
     <!-- OT::ContextFormat1* const -->
     <qualified-type-def type-id='type-id-1553' const='yes' id='type-id-1554'/>
     <!-- OT::ContextFormat2* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1555'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1555'/>
     <!-- OT::ContextFormat2* const -->
     <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1556'/>
     <!-- OT::ContextFormat3* -->
-    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1557'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-1557'/>
     <!-- OT::ContextFormat3* const -->
     <qualified-type-def type-id='type-id-1557' const='yes' id='type-id-1558'/>
     <!-- OT::Coverage& -->
@@ -17648,15 +17648,15 @@
     <!-- OT::Coverage* const -->
     <qualified-type-def type-id='type-id-416' const='yes' id='type-id-1559'/>
     <!-- OT::Coverage::Iter* -->
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-870'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-799'/>
     <!-- OT::Coverage::Iter* const -->
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-1560'/>
     <!-- OT::CoverageFormat1* -->
     <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-426'/>
     <!-- OT::CoverageFormat1* const -->
     <qualified-type-def type-id='type-id-426' const='yes' id='type-id-1561'/>
     <!-- OT::CoverageFormat1::Iter* -->
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1562'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-1562'/>
     <!-- OT::CoverageFormat1::Iter* const -->
     <qualified-type-def type-id='type-id-1562' const='yes' id='type-id-1563'/>
     <!-- OT::CoverageFormat2* -->
@@ -17664,7 +17664,7 @@
     <!-- OT::CoverageFormat2* const -->
     <qualified-type-def type-id='type-id-430' const='yes' id='type-id-1564'/>
     <!-- OT::CoverageFormat2::Iter* -->
-    <pointer-type-def type-id='type-id-869' size-in-bits='64' id='type-id-1565'/>
+    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-1565'/>
     <!-- OT::CoverageFormat2::Iter* const -->
     <qualified-type-def type-id='type-id-1565' const='yes' id='type-id-1566'/>
     <!-- OT::CursivePos* -->
@@ -17672,13 +17672,13 @@
     <!-- OT::CursivePos* const -->
     <qualified-type-def type-id='type-id-1568' const='yes' id='type-id-1569'/>
     <!-- OT::CursivePosFormat1* -->
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1570'/>
     <!-- OT::CursivePosFormat1* const -->
     <qualified-type-def type-id='type-id-1570' const='yes' id='type-id-1571'/>
     <!-- OT::Device& -->
-    <reference-type-def kind='lvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-889' size-in-bits='64' id='type-id-1572'/>
     <!-- OT::Device* -->
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1573'/>
+    <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-1573'/>
     <!-- OT::Device* const -->
     <qualified-type-def type-id='type-id-1573' const='yes' id='type-id-1574'/>
     <!-- OT::EntryExitRecord& -->
@@ -17692,17 +17692,17 @@
     <!-- OT::Extension<OT::ExtensionPos>* const -->
     <qualified-type-def type-id='type-id-1579' const='yes' id='type-id-1580'/>
     <!-- OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-1581'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-1581'/>
     <!-- OT::Extension<OT::ExtensionSubst>* const -->
     <qualified-type-def type-id='type-id-1581' const='yes' id='type-id-1582'/>
     <!-- OT::ExtensionFormat1* -->
-    <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-1583'/>
+    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-1583'/>
     <!-- OT::ExtensionFormat1* const -->
     <qualified-type-def type-id='type-id-1583' const='yes' id='type-id-1584'/>
     <!-- OT::Feature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1585'/>
+    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1585'/>
     <!-- OT::Feature* -->
-    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-1586'/>
     <!-- OT::Feature* const -->
     <qualified-type-def type-id='type-id-1586' const='yes' id='type-id-1587'/>
     <!-- OT::FeatureParams& -->
@@ -17712,15 +17712,15 @@
     <!-- OT::FeatureParams* const -->
     <qualified-type-def type-id='type-id-1590' const='yes' id='type-id-1591'/>
     <!-- OT::FeatureParamsCharacterVariants* -->
-    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-1592'/>
+    <pointer-type-def type-id='type-id-893' size-in-bits='64' id='type-id-1592'/>
     <!-- OT::FeatureParamsCharacterVariants* const -->
     <qualified-type-def type-id='type-id-1592' const='yes' id='type-id-1593'/>
     <!-- OT::FeatureParamsSize* -->
-    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-1594'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-1594'/>
     <!-- OT::FeatureParamsSize* const -->
     <qualified-type-def type-id='type-id-1594' const='yes' id='type-id-1595'/>
     <!-- OT::FeatureParamsStylisticSet* -->
-    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-1596'/>
+    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-1596'/>
     <!-- OT::FeatureParamsStylisticSet* const -->
     <qualified-type-def type-id='type-id-1596' const='yes' id='type-id-1597'/>
     <!-- OT::GDEF* -->
@@ -17750,9 +17750,9 @@
     <!-- OT::IntType<unsigned int, 3u>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-1612'/>
     <!-- OT::LangSys& -->
-    <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-1613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1613'/>
     <!-- OT::LangSys* -->
-    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-1614'/>
     <!-- OT::LangSys* const -->
     <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-1615'/>
     <!-- OT::LigCaretList& -->
@@ -17780,7 +17780,7 @@
     <!-- OT::LigatureSet* const -->
     <qualified-type-def type-id='type-id-418' const='yes' id='type-id-1625'/>
     <!-- OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1626'/>
+    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-1626'/>
     <!-- OT::LigatureSubst* const -->
     <qualified-type-def type-id='type-id-1626' const='yes' id='type-id-1627'/>
     <!-- OT::LigatureSubstFormat1* -->
@@ -17808,7 +17808,7 @@
     <!-- OT::MarkBasePos* const -->
     <qualified-type-def type-id='type-id-1637' const='yes' id='type-id-1638'/>
     <!-- OT::MarkBasePosFormat1* -->
-    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-1639'/>
+    <pointer-type-def type-id='type-id-897' size-in-bits='64' id='type-id-1639'/>
     <!-- OT::MarkBasePosFormat1* const -->
     <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-1640'/>
     <!-- OT::MarkGlyphSets& -->
@@ -17826,7 +17826,7 @@
     <!-- OT::MarkLigPos* const -->
     <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1650'/>
     <!-- OT::MarkLigPosFormat1* -->
-    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1651'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-1651'/>
     <!-- OT::MarkLigPosFormat1* const -->
     <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1652'/>
     <!-- OT::MarkMarkPos* -->
@@ -17834,25 +17834,25 @@
     <!-- OT::MarkMarkPos* const -->
     <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1655'/>
     <!-- OT::MarkMarkPosFormat1* -->
-    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1656'/>
+    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-1656'/>
     <!-- OT::MarkMarkPosFormat1* const -->
     <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1657'/>
     <!-- OT::MarkRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-850' size-in-bits='64' id='type-id-1658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1658'/>
     <!-- OT::MarkRecord* -->
-    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-1659'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1659'/>
     <!-- OT::MarkRecord* const -->
     <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1660'/>
     <!-- OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-1661'/>
     <!-- OT::MultipleSubst* const -->
     <qualified-type-def type-id='type-id-1661' const='yes' id='type-id-1662'/>
     <!-- OT::MultipleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-1663'/>
     <!-- OT::MultipleSubstFormat1* const -->
     <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1664'/>
     <!-- OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-881' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-810' size-in-bits='64' id='type-id-1665'/>
     <!-- OT::OffsetListOf<OT::AnchorMatrix>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
     <!-- OT::OffsetListOf<OT::AnchorMatrix>* -->
@@ -18064,21 +18064,21 @@
     <!-- OT::PairPos* const -->
     <qualified-type-def type-id='type-id-1738' const='yes' id='type-id-1739'/>
     <!-- OT::PairPosFormat1* -->
-    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1740'/>
+    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1740'/>
     <!-- OT::PairPosFormat1* const -->
     <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1741'/>
     <!-- OT::PairPosFormat2* -->
-    <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-1742'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1742'/>
     <!-- OT::PairPosFormat2* const -->
     <qualified-type-def type-id='type-id-1742' const='yes' id='type-id-1743'/>
     <!-- OT::PairSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1744'/>
+    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-1744'/>
     <!-- OT::PairSet* -->
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1745'/>
+    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1745'/>
     <!-- OT::PairSet* const -->
     <qualified-type-def type-id='type-id-1745' const='yes' id='type-id-1746'/>
     <!-- OT::PairSet::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-884'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-813'/>
     <!-- OT::PosLookup& -->
     <reference-type-def kind='lvalue' type-id='type-id-1422' size-in-bits='64' id='type-id-1747'/>
     <!-- OT::PosLookup* -->
@@ -18096,21 +18096,21 @@
     <!-- OT::RangeRecord* -->
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1755'/>
     <!-- OT::Record<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1756'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1756'/>
     <!-- OT::Record<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-1757'/>
+    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1757'/>
     <!-- OT::Record<OT::Feature>* const -->
     <qualified-type-def type-id='type-id-1757' const='yes' id='type-id-1758'/>
     <!-- OT::Record<OT::LangSys>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1759'/>
+    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1759'/>
     <!-- OT::Record<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1760'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-1760'/>
     <!-- OT::Record<OT::LangSys>* const -->
     <qualified-type-def type-id='type-id-1760' const='yes' id='type-id-1761'/>
     <!-- OT::Record<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-856' size-in-bits='64' id='type-id-1762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1762'/>
     <!-- OT::Record<OT::Script>* -->
-    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1763'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1763'/>
     <!-- OT::Record<OT::Script>* const -->
     <qualified-type-def type-id='type-id-1763' const='yes' id='type-id-1764'/>
     <!-- OT::RecordListOf<OT::Feature>& -->
@@ -18126,11 +18126,11 @@
     <!-- OT::RecordListOf<OT::Script>* const -->
     <qualified-type-def type-id='type-id-1771' const='yes' id='type-id-1772'/>
     <!-- OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1773'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1773'/>
     <!-- OT::ReverseChainSingleSubst* const -->
     <qualified-type-def type-id='type-id-1773' const='yes' id='type-id-1774'/>
     <!-- OT::ReverseChainSingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1775'/>
     <!-- OT::ReverseChainSingleSubstFormat1* const -->
     <qualified-type-def type-id='type-id-1775' const='yes' id='type-id-1776'/>
     <!-- OT::Rule& -->
@@ -18162,15 +18162,15 @@
     <!-- OT::SinglePos* const -->
     <qualified-type-def type-id='type-id-1794' const='yes' id='type-id-1795'/>
     <!-- OT::SinglePosFormat1* -->
-    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1796'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-1796'/>
     <!-- OT::SinglePosFormat1* const -->
     <qualified-type-def type-id='type-id-1796' const='yes' id='type-id-1797'/>
     <!-- OT::SinglePosFormat2* -->
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1798'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1798'/>
     <!-- OT::SinglePosFormat2* const -->
     <qualified-type-def type-id='type-id-1798' const='yes' id='type-id-1799'/>
     <!-- OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1800'/>
+    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-1800'/>
     <!-- OT::SingleSubst* const -->
     <qualified-type-def type-id='type-id-1800' const='yes' id='type-id-1801'/>
     <!-- OT::SingleSubstFormat1* -->
@@ -18256,45 +18256,45 @@
     <!-- OT::Value* -->
     <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1868'/>
     <!-- OT::ValueFormat* -->
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-973'/>
     <!-- OT::ValueFormat* const -->
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1869'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1869'/>
     <!-- OT::hb_apply_context_t* -->
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-896'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-826'/>
     <!-- OT::hb_apply_context_t* const -->
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1870'/>
+    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-1870'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1033'/>
     <!-- OT::hb_apply_context_t::matcher_t* const -->
-    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1871'/>
+    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1871'/>
     <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
     <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* const -->
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1872'/>
+    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1872'/>
     <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
     <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* const -->
-    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1873'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1873'/>
     <!-- OT::hb_closure_context_t* -->
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-894'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-824'/>
     <!-- OT::hb_closure_context_t* const -->
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1874'/>
+    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-1874'/>
     <!-- OT::hb_collect_glyphs_context_t* -->
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-892'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-822'/>
     <!-- OT::hb_collect_glyphs_context_t* const -->
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1875'/>
+    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-1875'/>
     <!-- OT::hb_get_coverage_context_t* -->
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-910'/>
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-840'/>
     <!-- OT::hb_get_coverage_context_t* const -->
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1876'/>
+    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-1876'/>
     <!-- OT::hb_would_apply_context_t* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-820'/>
     <!-- OT::hb_would_apply_context_t* const -->
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1877'/>
+    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-1877'/>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*)* -->
     <pointer-type-def type-id='type-id-1878' size-in-bits='64' id='type-id-1879'/>
     <!-- bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* -->
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1032'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1880'/>
     <!-- const GPOSProxy -->
@@ -18306,15 +18306,15 @@
     <!-- const GSUBProxy& -->
     <reference-type-def kind='lvalue' type-id='type-id-1882' size-in-bits='64' id='type-id-1394'/>
     <!-- const OT::AlternateSubst -->
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-1010'/>
+    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1069'/>
     <!-- const OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-920'/>
     <!-- const OT::AlternateSubstFormat1 -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1079'/>
+    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1085'/>
     <!-- const OT::AlternateSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1050'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1045'/>
     <!-- const OT::AlternateSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1883'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1883'/>
     <!-- const OT::AlternateSubstFormat1* const -->
     <qualified-type-def type-id='type-id-1883' const='yes' id='type-id-1884'/>
     <!-- const OT::Anchor -->
@@ -18326,25 +18326,25 @@
     <!-- const OT::Anchor* const -->
     <qualified-type-def type-id='type-id-1887' const='yes' id='type-id-1888'/>
     <!-- const OT::AnchorFormat1 -->
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-675'/>
+    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-675'/>
     <!-- const OT::AnchorFormat1* -->
     <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-591'/>
     <!-- const OT::AnchorFormat1* const -->
     <qualified-type-def type-id='type-id-591' const='yes' id='type-id-1889'/>
     <!-- const OT::AnchorFormat2 -->
-    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-676'/>
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-676'/>
     <!-- const OT::AnchorFormat2* -->
     <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-592'/>
     <!-- const OT::AnchorFormat2* const -->
     <qualified-type-def type-id='type-id-592' const='yes' id='type-id-1890'/>
     <!-- const OT::AnchorFormat3 -->
-    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-677'/>
+    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-677'/>
     <!-- const OT::AnchorFormat3* -->
     <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-593'/>
     <!-- const OT::AnchorFormat3* const -->
     <qualified-type-def type-id='type-id-593' const='yes' id='type-id-1891'/>
     <!-- const OT::AnchorMatrix -->
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-678'/>
+    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-678'/>
     <!-- const OT::AnchorMatrix& -->
     <qualified-type-def type-id='type-id-1892' id='type-id-1893'/>
     <!-- const OT::AnchorMatrix& -->
@@ -18354,13 +18354,13 @@
     <!-- const OT::AnchorMatrix* const -->
     <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1894'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-681'/>
+    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-681'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-590'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-590' const='yes' id='type-id-1895'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-682'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-537'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* const -->
@@ -18368,15 +18368,15 @@
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1897'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-685'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-685'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-548'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-686'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-577'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-687'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-687'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-595'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* const -->
@@ -18388,47 +18388,47 @@
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-557' const='yes' id='type-id-1899'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-689'/>
+    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-689'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-689' size-in-bits='64' id='type-id-601'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-690'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-518'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-518' const='yes' id='type-id-1900'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-691'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-522'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-522' const='yes' id='type-id-1901'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-692'/>
+    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-692'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-576'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-576' const='yes' id='type-id-1902'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-693'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-693'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-575'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1903'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-808' const='yes' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-694'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-580'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-580' const='yes' id='type-id-1904'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-695'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-533'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-533' const='yes' id='type-id-1905'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-696'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-521'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
@@ -18446,73 +18446,73 @@
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-565' const='yes' id='type-id-1908'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-699'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-699'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-556'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-700'/>
+    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-700'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-587'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-587' const='yes' id='type-id-1909'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-701'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-701'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-701' size-in-bits='64' id='type-id-585'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-814' const='yes' id='type-id-702'/>
+    <qualified-type-def type-id='type-id-865' const='yes' id='type-id-702'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-586'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-586' const='yes' id='type-id-1910'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-703'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-703'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-571'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-571' const='yes' id='type-id-1911'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-704'/>
+    <qualified-type-def type-id='type-id-867' const='yes' id='type-id-704'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-570'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-570' const='yes' id='type-id-1912'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-705'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-705'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-563'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-563' const='yes' id='type-id-1913'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-706'/>
+    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-706'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-561'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-707'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-707'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-562'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1914'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-708'/>
+    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-708'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-516'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-516' const='yes' id='type-id-1915'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-709'/>
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-709'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-545'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-545' const='yes' id='type-id-1916'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-710'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-710'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-540'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* const -->
     <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1917'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-711'/>
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-711'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-536'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* const -->
@@ -18536,51 +18536,51 @@
     <!-- const OT::CaretValue* const -->
     <qualified-type-def type-id='type-id-1926' const='yes' id='type-id-1927'/>
     <!-- const OT::CaretValueFormat1 -->
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-715'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-715'/>
     <!-- const OT::CaretValueFormat1* -->
     <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-523'/>
     <!-- const OT::CaretValueFormat1* const -->
     <qualified-type-def type-id='type-id-523' const='yes' id='type-id-1928'/>
     <!-- const OT::CaretValueFormat2 -->
-    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-716'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-716'/>
     <!-- const OT::CaretValueFormat2* -->
     <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-524'/>
     <!-- const OT::CaretValueFormat2* const -->
     <qualified-type-def type-id='type-id-524' const='yes' id='type-id-1929'/>
     <!-- const OT::CaretValueFormat3 -->
-    <qualified-type-def type-id='type-id-829' const='yes' id='type-id-717'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-717'/>
     <!-- const OT::CaretValueFormat3* -->
     <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-527'/>
     <!-- const OT::CaretValueFormat3* const -->
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-1930'/>
     <!-- const OT::ChainContext -->
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1080'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1086'/>
     <!-- const OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1020'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1015'/>
     <!-- const OT::ChainContext* const -->
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1931'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1931'/>
     <!-- const OT::ChainContextFormat1 -->
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1081'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1087'/>
     <!-- const OT::ChainContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1056'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1051'/>
     <!-- const OT::ChainContextFormat1* -->
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1932'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1932'/>
     <!-- const OT::ChainContextFormat1* const -->
     <qualified-type-def type-id='type-id-1932' const='yes' id='type-id-1933'/>
     <!-- const OT::ChainContextFormat2 -->
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1088'/>
     <!-- const OT::ChainContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1057'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1088' size-in-bits='64' id='type-id-1052'/>
     <!-- const OT::ChainContextFormat2* -->
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1934'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1934'/>
     <!-- const OT::ChainContextFormat2* const -->
     <qualified-type-def type-id='type-id-1934' const='yes' id='type-id-1935'/>
     <!-- const OT::ChainContextFormat3 -->
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1083'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1089'/>
     <!-- const OT::ChainContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1058'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-1053'/>
     <!-- const OT::ChainContextFormat3* -->
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1936'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1936'/>
     <!-- const OT::ChainContextFormat3* const -->
     <qualified-type-def type-id='type-id-1936' const='yes' id='type-id-1937'/>
     <!-- const OT::ChainRule -->
@@ -18608,7 +18608,7 @@
     <!-- const OT::ClassDef* const -->
     <qualified-type-def type-id='type-id-1948' const='yes' id='type-id-1949'/>
     <!-- const OT::ClassDefFormat1 -->
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-718'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-718'/>
     <!-- const OT::ClassDefFormat1* -->
     <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-531'/>
     <!-- const OT::ClassDefFormat1* const -->
@@ -18620,79 +18620,79 @@
     <!-- const OT::ClassDefFormat2* const -->
     <qualified-type-def type-id='type-id-1952' const='yes' id='type-id-1953'/>
     <!-- const OT::Context -->
-    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1084'/>
+    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1090'/>
     <!-- const OT::Context* -->
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1024'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1019'/>
     <!-- const OT::Context* const -->
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1954'/>
+    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1954'/>
     <!-- const OT::ContextFormat1 -->
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1085'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1091'/>
     <!-- const OT::ContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1053'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1048'/>
     <!-- const OT::ContextFormat1* -->
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1955'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1955'/>
     <!-- const OT::ContextFormat1* const -->
     <qualified-type-def type-id='type-id-1955' const='yes' id='type-id-1956'/>
     <!-- const OT::ContextFormat2 -->
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1092'/>
     <!-- const OT::ContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-1054'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1049'/>
     <!-- const OT::ContextFormat2* -->
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1957'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1957'/>
     <!-- const OT::ContextFormat2* const -->
     <qualified-type-def type-id='type-id-1957' const='yes' id='type-id-1958'/>
     <!-- const OT::ContextFormat3 -->
-    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-726'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-726'/>
     <!-- const OT::ContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1050'/>
     <!-- const OT::ContextFormat3* -->
     <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-574'/>
     <!-- const OT::ContextFormat3* const -->
     <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1959'/>
     <!-- const OT::Coverage -->
-    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-986'/>
     <!-- const OT::Coverage& -->
     <qualified-type-def type-id='type-id-999' id='type-id-1960'/>
     <!-- const OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-999'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-999'/>
     <!-- const OT::Coverage* -->
-    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-872'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-801'/>
     <!-- const OT::Coverage* const -->
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1961'/>
+    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-1961'/>
     <!-- const OT::CoverageFormat1 -->
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-919'/>
+    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-987'/>
     <!-- const OT::CoverageFormat1& -->
     <qualified-type-def type-id='type-id-1962' id='type-id-1963'/>
     <!-- const OT::CoverageFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-1962'/>
+    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-1962'/>
     <!-- const OT::CoverageFormat1* -->
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-874'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-803'/>
     <!-- const OT::CoverageFormat1* const -->
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1964'/>
+    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-1964'/>
     <!-- const OT::CoverageFormat2 -->
-    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-988'/>
     <!-- const OT::CoverageFormat2& -->
     <qualified-type-def type-id='type-id-1965' id='type-id-1966'/>
     <!-- const OT::CoverageFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-988' size-in-bits='64' id='type-id-1965'/>
     <!-- const OT::CoverageFormat2* -->
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-876'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-805'/>
     <!-- const OT::CoverageFormat2* const -->
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1967'/>
+    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-1967'/>
     <!-- const OT::CursivePos -->
     <qualified-type-def type-id='type-id-1567' const='yes' id='type-id-1968'/>
     <!-- const OT::CursivePos* -->
     <pointer-type-def type-id='type-id-1968' size-in-bits='64' id='type-id-1969'/>
     <!-- const OT::CursivePosFormat1 -->
-    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1087'/>
+    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1093'/>
     <!-- const OT::CursivePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1059'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1054'/>
     <!-- const OT::CursivePosFormat1* -->
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1970'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1970'/>
     <!-- const OT::CursivePosFormat1* const -->
     <qualified-type-def type-id='type-id-1970' const='yes' id='type-id-1971'/>
     <!-- const OT::Device -->
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-727'/>
+    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-727'/>
     <!-- const OT::Device& -->
     <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1972'/>
     <!-- const OT::Device* -->
@@ -18712,25 +18712,25 @@
     <!-- const OT::Extension<OT::ExtensionPos>* const -->
     <qualified-type-def type-id='type-id-1978' const='yes' id='type-id-1979'/>
     <!-- const OT::Extension<OT::ExtensionSubst> -->
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1088'/>
+    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-1094'/>
     <!-- const OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1026'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1021'/>
     <!-- const OT::Extension<OT::ExtensionSubst>* const -->
-    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1980'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1980'/>
     <!-- const OT::ExtensionFormat1 -->
-    <qualified-type-def type-id='type-id-841' const='yes' id='type-id-729'/>
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-729'/>
     <!-- const OT::ExtensionFormat1* -->
     <pointer-type-def type-id='type-id-729' size-in-bits='64' id='type-id-581'/>
     <!-- const OT::ExtensionFormat1* const -->
     <qualified-type-def type-id='type-id-581' const='yes' id='type-id-1981'/>
     <!-- const OT::ExtensionSubst -->
-    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-1982'/>
+    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-1982'/>
     <!-- const OT::ExtensionSubst* -->
     <pointer-type-def type-id='type-id-1982' size-in-bits='64' id='type-id-1983'/>
     <!-- const OT::ExtensionSubst* const -->
     <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1984'/>
     <!-- const OT::Feature -->
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-730'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-730'/>
     <!-- const OT::Feature& -->
     <reference-type-def kind='lvalue' type-id='type-id-730' size-in-bits='64' id='type-id-1985'/>
     <!-- const OT::Feature* -->
@@ -18746,29 +18746,29 @@
     <!-- const OT::FeatureParams* const -->
     <qualified-type-def type-id='type-id-1989' const='yes' id='type-id-1990'/>
     <!-- const OT::FeatureParamsCharacterVariants -->
-    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-731'/>
+    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-731'/>
     <!-- const OT::FeatureParamsCharacterVariants* -->
     <pointer-type-def type-id='type-id-731' size-in-bits='64' id='type-id-549'/>
     <!-- const OT::FeatureParamsSize -->
-    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-732'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-732'/>
     <!-- const OT::FeatureParamsSize& -->
     <reference-type-def kind='lvalue' type-id='type-id-732' size-in-bits='64' id='type-id-1991'/>
     <!-- const OT::FeatureParamsSize* -->
     <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-546'/>
     <!-- const OT::FeatureParamsStylisticSet -->
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-733'/>
+    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-733'/>
     <!-- const OT::FeatureParamsStylisticSet* -->
     <pointer-type-def type-id='type-id-733' size-in-bits='64' id='type-id-547'/>
     <!-- const OT::FixedVersion* const -->
     <qualified-type-def type-id='type-id-340' const='yes' id='type-id-1992'/>
     <!-- const OT::GDEF -->
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1110'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1113'/>
     <!-- const OT::GDEF& -->
-    <qualified-type-def type-id='type-id-1089' id='type-id-1046'/>
+    <qualified-type-def type-id='type-id-1095' id='type-id-1041'/>
     <!-- const OT::GDEF& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1089'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1113' size-in-bits='64' id='type-id-1095'/>
     <!-- const OT::GDEF* -->
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1993'/>
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1993'/>
     <!-- const OT::GDEF* const -->
     <qualified-type-def type-id='type-id-1993' const='yes' id='type-id-1994'/>
     <!-- const OT::GPOS -->
@@ -18810,7 +18810,7 @@
     <!-- const OT::Index* -->
     <pointer-type-def type-id='type-id-2007' size-in-bits='64' id='type-id-2009'/>
     <!-- const OT::IndexArray -->
-    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-2010'/>
+    <qualified-type-def type-id='type-id-964' const='yes' id='type-id-2010'/>
     <!-- const OT::IndexArray* -->
     <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2011'/>
     <!-- const OT::IndexArray* const -->
@@ -18818,7 +18818,7 @@
     <!-- const OT::IntType<short int, 2u>* const -->
     <qualified-type-def type-id='type-id-346' const='yes' id='type-id-2013'/>
     <!-- const OT::LangSys -->
-    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-735'/>
     <!-- const OT::LangSys& -->
     <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-2014'/>
     <!-- const OT::LangSys* -->
@@ -18858,15 +18858,15 @@
     <!-- const OT::LigatureSet* const -->
     <qualified-type-def type-id='type-id-2030' const='yes' id='type-id-2031'/>
     <!-- const OT::LigatureSubst -->
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1011'/>
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-1070'/>
     <!-- const OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-966'/>
     <!-- const OT::LigatureSubstFormat1 -->
-    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1090'/>
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1096'/>
     <!-- const OT::LigatureSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-1052'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1047'/>
     <!-- const OT::LigatureSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-2032'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-2032'/>
     <!-- const OT::LigatureSubstFormat1* const -->
     <qualified-type-def type-id='type-id-2032' const='yes' id='type-id-2033'/>
     <!-- const OT::Lookup -->
@@ -18898,9 +18898,9 @@
     <!-- const OT::MarkBasePos* -->
     <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-2045'/>
     <!-- const OT::MarkBasePosFormat1 -->
-    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-737'/>
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-737'/>
     <!-- const OT::MarkBasePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1060'/>
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1055'/>
     <!-- const OT::MarkBasePosFormat1* -->
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-600'/>
     <!-- const OT::MarkBasePosFormat1* const -->
@@ -18924,9 +18924,9 @@
     <!-- const OT::MarkLigPos* -->
     <pointer-type-def type-id='type-id-2054' size-in-bits='64' id='type-id-2055'/>
     <!-- const OT::MarkLigPosFormat1 -->
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-738'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-738'/>
     <!-- const OT::MarkLigPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1061'/>
+    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1056'/>
     <!-- const OT::MarkLigPosFormat1* -->
     <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-603'/>
     <!-- const OT::MarkLigPosFormat1* const -->
@@ -18936,33 +18936,33 @@
     <!-- const OT::MarkMarkPos* -->
     <pointer-type-def type-id='type-id-2057' size-in-bits='64' id='type-id-2058'/>
     <!-- const OT::MarkMarkPosFormat1 -->
-    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-739'/>
+    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-739'/>
     <!-- const OT::MarkMarkPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1062'/>
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1057'/>
     <!-- const OT::MarkMarkPosFormat1* -->
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-604'/>
     <!-- const OT::MarkMarkPosFormat1* const -->
     <qualified-type-def type-id='type-id-604' const='yes' id='type-id-2059'/>
     <!-- const OT::MarkRecord -->
-    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-740'/>
     <!-- const OT::MarkRecord& -->
     <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-2060'/>
     <!-- const OT::MarkRecord* -->
     <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-596'/>
     <!-- const OT::MultipleSubst -->
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1012'/>
+    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-1071'/>
     <!-- const OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-969'/>
     <!-- const OT::MultipleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1091'/>
+    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-1097'/>
     <!-- const OT::MultipleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-1044'/>
     <!-- const OT::MultipleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-2061'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-2061'/>
     <!-- const OT::MultipleSubstFormat1* const -->
     <qualified-type-def type-id='type-id-2061' const='yes' id='type-id-2062'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-2063'/>
+    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-2063'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-2063' size-in-bits='64' id='type-id-2064'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >* -->
@@ -19252,23 +19252,23 @@
     <!-- const OT::PairPos* -->
     <pointer-type-def type-id='type-id-2133' size-in-bits='64' id='type-id-2134'/>
     <!-- const OT::PairPosFormat1 -->
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-780'/>
+    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-780'/>
     <!-- const OT::PairPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1065'/>
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1060'/>
     <!-- const OT::PairPosFormat1* -->
     <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-607'/>
     <!-- const OT::PairPosFormat1* const -->
     <qualified-type-def type-id='type-id-607' const='yes' id='type-id-2135'/>
     <!-- const OT::PairPosFormat2 -->
-    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-781'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-781'/>
     <!-- const OT::PairPosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1066'/>
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1061'/>
     <!-- const OT::PairPosFormat2* -->
     <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-608'/>
     <!-- const OT::PairPosFormat2* const -->
     <qualified-type-def type-id='type-id-608' const='yes' id='type-id-2136'/>
     <!-- const OT::PairSet -->
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-782'/>
     <!-- const OT::PairSet& -->
     <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-2137'/>
     <!-- const OT::PairSet* -->
@@ -19296,25 +19296,25 @@
     <!-- const OT::PosLookupSubTable* const -->
     <qualified-type-def type-id='type-id-2146' const='yes' id='type-id-2147'/>
     <!-- const OT::RangeRecord -->
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1111'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1114'/>
     <!-- const OT::RangeRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1111' size-in-bits='64' id='type-id-2148'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-2148'/>
     <!-- const OT::RangeRecord* -->
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1082'/>
     <!-- const OT::RangeRecord* const -->
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-2149'/>
+    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-2149'/>
     <!-- const OT::Record<OT::Feature> -->
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-783'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-783'/>
     <!-- const OT::Record<OT::Feature>& -->
     <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-2150'/>
     <!-- const OT::Record<OT::Feature>* -->
     <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-554'/>
     <!-- const OT::Record<OT::Feature>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-921'/>
+    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-989'/>
     <!-- const OT::Record<OT::Feature>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-882'/>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-811'/>
     <!-- const OT::Record<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-784'/>
+    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-784'/>
     <!-- const OT::Record<OT::LangSys>& -->
     <reference-type-def kind='lvalue' type-id='type-id-784' size-in-bits='64' id='type-id-2151'/>
     <!-- const OT::Record<OT::LangSys>* -->
@@ -19322,11 +19322,11 @@
     <!-- const OT::Record<OT::LangSys>* const -->
     <qualified-type-def type-id='type-id-541' const='yes' id='type-id-2152'/>
     <!-- const OT::Record<OT::LangSys>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-922'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-990'/>
     <!-- const OT::Record<OT::LangSys>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-883'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-812'/>
     <!-- const OT::Record<OT::Script> -->
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-785'/>
     <!-- const OT::Record<OT::Script>& -->
     <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-2153'/>
     <!-- const OT::Record<OT::Script>* -->
@@ -19334,9 +19334,9 @@
     <!-- const OT::Record<OT::Script>* const -->
     <qualified-type-def type-id='type-id-543' const='yes' id='type-id-2154'/>
     <!-- const OT::Record<OT::Script>::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-923'/>
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-991'/>
     <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-814'/>
     <!-- const OT::RecordArrayOf<OT::Feature> -->
     <qualified-type-def type-id='type-id-2155' const='yes' id='type-id-2156'/>
     <!-- const OT::RecordArrayOf<OT::Feature>* -->
@@ -19372,15 +19372,15 @@
     <!-- const OT::RecordListOf<OT::Script>* const -->
     <qualified-type-def type-id='type-id-2173' const='yes' id='type-id-2174'/>
     <!-- const OT::ReverseChainSingleSubst -->
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1013'/>
+    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-1072'/>
     <!-- const OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-979'/>
     <!-- const OT::ReverseChainSingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1098'/>
     <!-- const OT::ReverseChainSingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1046'/>
     <!-- const OT::ReverseChainSingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-2175'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-2175'/>
     <!-- const OT::ReverseChainSingleSubstFormat1* const -->
     <qualified-type-def type-id='type-id-2175' const='yes' id='type-id-2176'/>
     <!-- const OT::Rule -->
@@ -19424,49 +19424,49 @@
     <!-- const OT::SinglePos* -->
     <pointer-type-def type-id='type-id-2195' size-in-bits='64' id='type-id-2196'/>
     <!-- const OT::SinglePosFormat1 -->
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-786'/>
+    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-786'/>
     <!-- const OT::SinglePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1063'/>
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1058'/>
     <!-- const OT::SinglePosFormat1* -->
     <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-605'/>
     <!-- const OT::SinglePosFormat1* const -->
     <qualified-type-def type-id='type-id-605' const='yes' id='type-id-2197'/>
     <!-- const OT::SinglePosFormat2 -->
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-787'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-787'/>
     <!-- const OT::SinglePosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1064'/>
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1059'/>
     <!-- const OT::SinglePosFormat2* -->
     <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-606'/>
     <!-- const OT::SinglePosFormat2* const -->
     <qualified-type-def type-id='type-id-606' const='yes' id='type-id-2198'/>
     <!-- const OT::SingleSubst -->
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-1073'/>
     <!-- const OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-981'/>
     <!-- const OT::SingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1093'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1099'/>
     <!-- const OT::SingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1042'/>
     <!-- const OT::SingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-2199'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-2199'/>
     <!-- const OT::SingleSubstFormat1* const -->
     <qualified-type-def type-id='type-id-2199' const='yes' id='type-id-2200'/>
     <!-- const OT::SingleSubstFormat2 -->
-    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1094'/>
+    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1100'/>
     <!-- const OT::SingleSubstFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1094' size-in-bits='64' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-1043'/>
     <!-- const OT::SingleSubstFormat2* -->
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-2201'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-2201'/>
     <!-- const OT::SingleSubstFormat2* const -->
     <qualified-type-def type-id='type-id-2201' const='yes' id='type-id-2202'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-924'/>
+    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-992'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-886'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-815'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-925'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-993'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-888'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-818'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
     <qualified-type-def type-id='type-id-2203' const='yes' id='type-id-2204'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
@@ -19476,35 +19476,35 @@
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
     <pointer-type-def type-id='type-id-2207' size-in-bits='64' id='type-id-2208'/>
     <!-- const OT::SubstLookup -->
-    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-926'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-994'/>
     <!-- const OT::SubstLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-1409'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-1409'/>
     <!-- const OT::SubstLookup* -->
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-889'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-819'/>
     <!-- const OT::SubstLookup* const -->
-    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-2209'/>
+    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-2209'/>
     <!-- const OT::SubstLookupSubTable -->
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-927'/>
+    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-995'/>
     <!-- const OT::SubstLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-1022'/>
     <!-- const OT::SubstLookupSubTable* -->
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-909'/>
+    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-839'/>
     <!-- const OT::SubstLookupSubTable* const -->
-    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-2210'/>
+    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-2210'/>
     <!-- const OT::Tag& -->
     <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-2211'/>
     <!-- const OT::USHORT -->
-    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1097'/>
+    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1103'/>
     <!-- const OT::USHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-2212'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-2212'/>
     <!-- const OT::USHORT* -->
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1035'/>
     <!-- const OT::Value -->
     <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-2213'/>
     <!-- const OT::Value* -->
     <pointer-type-def type-id='type-id-2213' size-in-bits='64' id='type-id-2214'/>
     <!-- const OT::ValueFormat -->
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-2215'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-2215'/>
     <!-- const OT::ValueFormat* -->
     <pointer-type-def type-id='type-id-2215' size-in-bits='64' id='type-id-2216'/>
     <!-- const OT::ValueFormat* const -->
@@ -19516,19 +19516,19 @@
     <!-- const OT::hb_apply_context_t* const -->
     <qualified-type-def type-id='type-id-2219' const='yes' id='type-id-2220'/>
     <!-- const OT::hb_apply_context_t::matcher_t -->
-    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-2221'/>
+    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-2221'/>
     <!-- const OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-2221' size-in-bits='64' id='type-id-2222'/>
     <!-- const OT::hb_apply_context_t::matcher_t* const -->
     <qualified-type-def type-id='type-id-2222' const='yes' id='type-id-2223'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t -->
-    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-2224'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-2224'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-2224' size-in-bits='64' id='type-id-2225'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t* const -->
     <qualified-type-def type-id='type-id-2225' const='yes' id='type-id-2226'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-2227'/>
+    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-2227'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t* -->
     <pointer-type-def type-id='type-id-2227' size-in-bits='64' id='type-id-2228'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t* const -->
@@ -19540,7 +19540,7 @@
     <!-- const OT::hb_closure_context_t* const -->
     <qualified-type-def type-id='type-id-2231' const='yes' id='type-id-2232'/>
     <!-- const OT::hb_closure_context_t::return_t -->
-    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-2233'/>
+    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-2233'/>
     <!-- const OT::hb_collect_glyphs_context_t -->
     <qualified-type-def type-id='type-id-915' const='yes' id='type-id-2234'/>
     <!-- const OT::hb_collect_glyphs_context_t* -->
@@ -19548,7 +19548,7 @@
     <!-- const OT::hb_collect_glyphs_context_t* const -->
     <qualified-type-def type-id='type-id-2235' const='yes' id='type-id-2236'/>
     <!-- const OT::hb_collect_glyphs_context_t::return_t -->
-    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-2237'/>
+    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-2237'/>
     <!-- const OT::hb_would_apply_context_t -->
     <qualified-type-def type-id='type-id-917' const='yes' id='type-id-2238'/>
     <!-- const OT::hb_would_apply_context_t* -->
@@ -19556,11 +19556,11 @@
     <!-- const OT::hb_would_apply_context_t* const -->
     <qualified-type-def type-id='type-id-2239' const='yes' id='type-id-2240'/>
     <!-- const _hb_void_t -->
-    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1104'/>
     <!-- const _hb_void_t& -->
     <qualified-type-def type-id='type-id-1076' id='type-id-2241'/>
     <!-- const _hb_void_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1076'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-1076'/>
     <!-- const bool -->
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-1416'/>
     <!-- const hb_buffer_t* const -->
@@ -19616,7 +19616,7 @@
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* const -->
     <qualified-type-def type-id='type-id-2261' const='yes' id='type-id-2262'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-2263'/>
+    <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-2263'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
     <pointer-type-def type-id='type-id-2263' size-in-bits='64' id='type-id-2264'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* const -->
@@ -19628,25 +19628,25 @@
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* const -->
     <qualified-type-def type-id='type-id-2267' const='yes' id='type-id-2268'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-2269'/>
+    <qualified-type-def type-id='type-id-1110' const='yes' id='type-id-2269'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
     <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2270'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u>* const -->
     <qualified-type-def type-id='type-id-2270' const='yes' id='type-id-2271'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-2272'/>
+    <qualified-type-def type-id='type-id-1083' const='yes' id='type-id-2272'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
     <pointer-type-def type-id='type-id-2272' size-in-bits='64' id='type-id-2273'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u>* const -->
     <qualified-type-def type-id='type-id-2273' const='yes' id='type-id-2274'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-2275'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-2275'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
     <pointer-type-def type-id='type-id-2275' size-in-bits='64' id='type-id-2276'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u>* const -->
     <qualified-type-def type-id='type-id-2276' const='yes' id='type-id-2277'/>
     <!-- const hb_set_digest_t -->
-    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-2278'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-2278'/>
     <!-- const hb_set_digest_t* -->
     <pointer-type-def type-id='type-id-2278' size-in-bits='64' id='type-id-2279'/>
     <!-- const hb_tag_t& -->
@@ -19686,7 +19686,7 @@
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
     <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-2290'/>
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-2291'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-2291'/>
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* const -->
     <qualified-type-def type-id='type-id-2291' const='yes' id='type-id-2292'/>
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* -->
@@ -19694,25 +19694,25 @@
     <!-- hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* const -->
     <qualified-type-def type-id='type-id-2293' const='yes' id='type-id-2294'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-2295'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-2295'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 0u>* const -->
     <qualified-type-def type-id='type-id-2295' const='yes' id='type-id-2296'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-2297'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-2297'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 4u>* const -->
     <qualified-type-def type-id='type-id-2297' const='yes' id='type-id-2298'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-2299'/>
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-2299'/>
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u>* const -->
     <qualified-type-def type-id='type-id-2299' const='yes' id='type-id-2300'/>
     <!-- hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-873'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-802'/>
     <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1040'/>
     <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1068'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1063'/>
     <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1070'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1065'/>
     <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* -->
     <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-1390'/>
     <!-- void (hb_set_t*, const OT::USHORT&, void*)* -->
@@ -19720,7 +19720,7 @@
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::ExtensionFormat1 -->
-      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-841'>
+      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-891'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ExtensionFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
@@ -19750,7 +19750,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19758,14 +19758,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-808'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-859'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -19822,7 +19822,7 @@
       <class-decl name='Ligature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-626'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::Ligature::ligGlyph -->
-          <var-decl name='ligGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::Ligature::component -->
@@ -19837,11 +19837,11 @@
       <class-decl name='RangeRecord' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::GlyphID OT::RangeRecord::start -->
-          <var-decl name='start' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::RangeRecord::end -->
-          <var-decl name='end' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::RangeRecord::value -->
@@ -19859,9 +19859,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -19870,9 +19870,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -19882,7 +19882,7 @@
       <class-decl name='LigatureSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-627'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::OffsetArrayOf<OT::Ligature> OT::LigatureSet::ligature -->
-          <var-decl name='ligature' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-807' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSet::min_size -->
@@ -19897,9 +19897,9 @@
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-886' is-artificial='yes'/>
+            <parameter type-id='type-id-815' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
@@ -19909,7 +19909,7 @@
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-674'>
         <member-type access='public'>
           <!-- enum OT::SubstLookupSubTable::Type -->
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-898'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-828'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -19923,10 +19923,10 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-899'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-829'>
             <member-type access='private'>
               <!-- struct {OT::USHORT sub_format;} -->
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-900'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <!-- OT::USHORT sub_format -->
                   <var-decl name='sub_format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
@@ -19935,45 +19935,45 @@
             </member-type>
             <data-member access='private'>
               <!-- struct {OT::USHORT sub_format;} header -->
-              <var-decl name='header' type-id='type-id-900' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::SingleSubst single -->
-              <var-decl name='single' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::MultipleSubst multiple -->
-              <var-decl name='multiple' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AlternateSubst alternate -->
-              <var-decl name='alternate' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::LigatureSubst ligature -->
-              <var-decl name='ligature' type-id='type-id-904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextSubst context -->
-              <var-decl name='context' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextSubst chainContext -->
-              <var-decl name='chainContext' type-id='type-id-906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ExtensionSubst extension -->
-              <var-decl name='extension' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
-              <var-decl name='reverseChainContextSingle' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {struct {OT::USHORT sub_format;} header; OT::SingleSubst single; OT::MultipleSubst multiple; OT::AlternateSubst alternate; OT::LigatureSubst ligature; OT::ContextSubst context; OT::ChainContextSubst chainContext; OT::ExtensionSubst extension; OT::ReverseChainSingleSubst reverseChainContextSingle;} OT::SubstLookupSubTable::u -->
-          <var-decl name='u' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SubstLookupSubTable::min_size -->
@@ -19983,20 +19983,20 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-909' is-artificial='yes'/>
+            <parameter type-id='type-id-839' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-651'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -20014,9 +20014,9 @@
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -20025,44 +20025,44 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-889' is-artificial='yes'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -20082,7 +20082,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- OT::USHORT OT::Lookup::markFilteringSetX[1] -->
-          <var-decl name='markFilteringSetX' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Lookup::min_size -->
@@ -20105,28 +20105,28 @@
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-672'>
         <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-820'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-888' is-artificial='yes'/>
+            <parameter type-id='type-id-818' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <!-- int -->
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-820'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::RangeRecord OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -20160,10 +20160,10 @@
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-623'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat1::Iter -->
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-868'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-797'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat1* OT::CoverageFormat1::Iter::c -->
-              <var-decl name='c' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-803' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat1::Iter::i -->
@@ -20187,9 +20187,9 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-874' is-artificial='yes'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -20198,9 +20198,9 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-874' is-artificial='yes'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -20210,10 +20210,10 @@
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-624'>
         <member-type access='public'>
           <!-- struct OT::CoverageFormat2::Iter -->
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-869'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-798'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat2* OT::CoverageFormat2::Iter::c -->
-              <var-decl name='c' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-805' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat2::Iter::i -->
@@ -20245,9 +20245,9 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-876' is-artificial='yes'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -20256,23 +20256,23 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-876' is-artificial='yes'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-809'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-860'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -20354,17 +20354,17 @@
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-622'>
         <member-type access='public'>
           <!-- struct OT::Coverage::Iter -->
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-866'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-795'>
             <member-type access='private'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} -->
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-867'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-796'>
                 <data-member access='private'>
                   <!-- OT::CoverageFormat1::Iter format1 -->
-                  <var-decl name='format1' type-id='type-id-868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='private'>
                   <!-- OT::CoverageFormat2::Iter format2 -->
-                  <var-decl name='format2' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -20374,13 +20374,13 @@
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- union {OT::CoverageFormat1::Iter format1; OT::CoverageFormat2::Iter format2;} OT::Coverage::Iter::u -->
-              <var-decl name='u' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-796' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- OT::Coverage::Iter::Iter() -->
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
-                <parameter type-id='type-id-870' is-artificial='yes'/>
+                <parameter type-id='type-id-799' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-13'/>
               </function-decl>
@@ -20389,7 +20389,7 @@
         </member-type>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-871'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-800'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
@@ -20406,7 +20406,7 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::CoverageFormat1 format1; OT::CoverageFormat2 format2;} OT::Coverage::u -->
-          <var-decl name='u' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Coverage::min_size -->
@@ -20416,9 +20416,9 @@
           <!-- void OT::Coverage::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-872' is-artificial='yes'/>
+            <parameter type-id='type-id-801' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -20427,7 +20427,7 @@
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-660'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -20445,7 +20445,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > OT::MarkGlyphSetsFormat1::coverage -->
-          <var-decl name='coverage' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
+          <var-decl name='coverage' type-id='type-id-860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkGlyphSetsFormat1::min_size -->
@@ -20453,7 +20453,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-881'>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-810'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <data-member access='public' static='yes'>
@@ -20477,7 +20477,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::LigatureSet> OT::LigatureSubstFormat1::ligatureSet -->
-          <var-decl name='ligatureSet' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-808' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSubstFormat1::min_size -->
@@ -20516,7 +20516,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-794' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -20527,10 +20527,10 @@
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::matcher_t -->
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1033'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1028'>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1034'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1029'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -20539,7 +20539,7 @@
             </member-type>
             <member-type access='public'>
               <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1035'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1030'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -20548,7 +20548,7 @@
             </member-type>
             <member-type access='public'>
               <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
-              <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1036'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::matcher_t::lookup_props -->
@@ -20572,7 +20572,7 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t::match_func_t OT::hb_apply_context_t::matcher_t::match_func -->
-              <var-decl name='match_func' type-id='type-id-1036' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1031' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <!-- void* OT::hb_apply_context_t::matcher_t::match_data -->
@@ -20582,7 +20582,7 @@
               <!-- OT::hb_apply_context_t::matcher_t::matcher_t() -->
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-1033' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-13'/>
               </function-decl>
@@ -20591,22 +20591,22 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1039'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1034'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_backward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_backward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_backward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::num_items -->
@@ -20616,9 +20616,9 @@
               <!-- OT::hb_apply_context_t::skipping_backward_iterator_t::skipping_backward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1041' is-artificial='yes'/>
+                <parameter type-id='type-id-1036' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-826'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -20633,22 +20633,22 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1042'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1037'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- OT::hb_apply_context_t* OT::hb_apply_context_t::skipping_forward_iterator_t::c -->
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
               <!-- OT::hb_apply_context_t::matcher_t OT::hb_apply_context_t::skipping_forward_iterator_t::matcher -->
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_forward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::num_items -->
@@ -20662,9 +20662,9 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1043' is-artificial='yes'/>
+                <parameter type-id='type-id-1038' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-826'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-12'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -20679,11 +20679,11 @@
         </member-type>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1044'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1040' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1039'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef bool OT::hb_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
@@ -20719,7 +20719,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- OT::hb_apply_context_t::recurse_func_t OT::hb_apply_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1044' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1039' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <!-- unsigned int OT::hb_apply_context_t::nesting_level_left -->
@@ -20731,7 +20731,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- const OT::GDEF& OT::hb_apply_context_t::gdef -->
-          <var-decl name='gdef' type-id='type-id-1046' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1041' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- bool OT::hb_apply_context_t::has_glyph_classes -->
@@ -20745,7 +20745,7 @@
           <!-- OT::hb_apply_context_t::hb_apply_context_t(unsigned int, hb_font_t*, hb_buffer_t*) -->
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- parameter of type 'hb_font_t*' -->
@@ -20760,227 +20760,227 @@
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::hb_apply_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-644'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -20999,7 +20999,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::LangSys>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-883'/>
+            <parameter type-id='type-id-812'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21013,7 +21013,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -21021,10 +21021,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Record<OT::LangSys> -->
-      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-855'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-905'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::LangSys>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-987'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-975'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::LangSys>::tag -->
@@ -21046,7 +21046,7 @@
       <!-- struct OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-643'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21079,7 +21079,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<short unsigned int, 2u> OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -21087,7 +21087,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::FeatureParamsSize -->
-      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-844'>
+      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-894'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsSize::designSize -->
           <var-decl name='designSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
@@ -21118,7 +21118,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::FeatureParamsStylisticSet -->
-      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-845'>
+      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsStylisticSet::version -->
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
@@ -21137,7 +21137,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::FeatureParamsCharacterVariants -->
-      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-843'>
+      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-893'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::FeatureParamsCharacterVariants::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
@@ -21164,7 +21164,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > OT::FeatureParamsCharacterVariants::characters -->
-          <var-decl name='characters' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsCharacterVariants::min_size -->
@@ -21172,14 +21172,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-819'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-870'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -21189,7 +21189,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-962' is-artificial='yes'/>
+            <parameter type-id='type-id-950' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -21202,14 +21202,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-800'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-851'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IntType<unsigned int, 3u> OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -21219,7 +21219,7 @@
       <!-- struct OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-668'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21251,15 +21251,15 @@
           <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-2305'>
             <data-member access='private'>
               <!-- OT::FeatureParamsSize size -->
-              <var-decl name='size' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
+              <var-decl name='size' type-id='type-id-894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::FeatureParamsStylisticSet stylisticSet -->
-              <var-decl name='stylisticSet' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
+              <var-decl name='stylisticSet' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::FeatureParamsCharacterVariants characterVariants -->
-              <var-decl name='characterVariants' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
+              <var-decl name='characterVariants' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -21279,7 +21279,7 @@
       <!-- struct OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-639'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21293,7 +21293,7 @@
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_get_coverage_context_t::max_debug_depth -->
@@ -21307,7 +21307,7 @@
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -21316,225 +21316,225 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::MultipleSubstFormat1 -->
-      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-980'>
+      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-968'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MultipleSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
@@ -21545,7 +21545,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Sequence> OT::MultipleSubstFormat1::sequence -->
-          <var-decl name='sequence' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MultipleSubstFormat1::min_size -->
@@ -21553,7 +21553,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AlternateSubstFormat1 -->
-      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-931'>
+      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-919'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AlternateSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
@@ -21564,7 +21564,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > OT::AlternateSubstFormat1::alternateSet -->
-          <var-decl name='alternateSet' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AlternateSubstFormat1::min_size -->
@@ -21574,7 +21574,7 @@
       <!-- struct OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-641'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21585,7 +21585,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Device -->
-      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-839'>
+      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-889'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::Device::startSize -->
           <var-decl name='startSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
@@ -21600,7 +21600,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::Device::deltaValue[1] -->
-          <var-decl name='deltaValue' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Device::min_size -->
@@ -21608,7 +21608,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextFormat1 -->
-      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1022'>
+      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1017'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
@@ -21619,7 +21619,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat1::min_size -->
@@ -21627,7 +21627,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextFormat2 -->
-      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1023'>
+      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1018'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
@@ -21642,7 +21642,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::RuleSet> OT::ContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat2::min_size -->
@@ -21652,7 +21652,7 @@
       <!-- struct OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-637'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21663,14 +21663,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ClassDefFormat1 -->
-      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-830'>
+      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-880'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ClassDefFormat1::classFormat -->
           <var-decl name='classFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::GlyphID OT::ClassDefFormat1::startGlyph -->
-          <var-decl name='startGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat1::classValue -->
@@ -21686,7 +21686,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
             <parameter type-id='type-id-531' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -21695,7 +21695,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ContextFormat3 -->
-      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-838'>
+      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-888'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ContextFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
@@ -21710,11 +21710,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > OT::ContextFormat3::coverageZ[1] -->
-          <var-decl name='coverageZ' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::LookupRecord OT::ContextFormat3::lookupRecordX[1] -->
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat3::min_size -->
@@ -21722,7 +21722,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ChainContextFormat1 -->
-      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1017'>
+      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1012'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
@@ -21733,7 +21733,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat1::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat1::min_size -->
@@ -21760,7 +21760,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
             <parameter type-id='type-id-1952' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -21779,7 +21779,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::ClassDefFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
+              <var-decl name='format1' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ClassDefFormat2 format2 -->
@@ -21797,7 +21797,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ChainContextFormat2 -->
-      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1018'>
+      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1013'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
@@ -21820,7 +21820,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::ChainRuleSet> OT::ChainContextFormat2::ruleSet -->
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat2::min_size -->
@@ -21830,7 +21830,7 @@
       <!-- struct OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-633'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21848,7 +21848,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > OT::AttachList::attachPoint -->
-          <var-decl name='attachPoint' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
+          <var-decl name='attachPoint' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AttachList::min_size -->
@@ -21856,7 +21856,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubstFormat1 -->
-      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-990'>
+      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-978'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ReverseChainSingleSubstFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
@@ -21867,11 +21867,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ReverseChainSingleSubstFormat1::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::ReverseChainSingleSubstFormat1::substituteX -->
@@ -21883,19 +21883,19 @@
         </data-member>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > > -->
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1015'>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1010'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-804'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-855'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-804'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-855'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -21905,7 +21905,7 @@
       <!-- struct OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-632'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21916,26 +21916,26 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ChainContextFormat3 -->
-      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1019'>
+      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1014'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::ChainContextFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::backtrack -->
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::inputX -->
-          <var-decl name='inputX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
           <!-- OT::OffsetArrayOf<OT::Coverage> OT::ChainContextFormat3::lookaheadX -->
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
           <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > OT::ChainContextFormat3::lookupX -->
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat3::min_size -->
@@ -21945,7 +21945,7 @@
       <!-- struct OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-645'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -21956,86 +21956,86 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Extension<OT::ExtensionSubst> -->
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-975'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-963'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1025'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1020'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ExtensionFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ExtensionFormat1 format1;} OT::Extension<OT::ExtensionSubst>::u -->
-          <var-decl name='u' type-id='type-id-1025' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1027'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22057,17 +22057,17 @@
       <!-- struct OT::OffsetArrayOf<OT::LigGlyph> -->
       <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2307'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-861'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-810'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-861'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -22077,7 +22077,7 @@
       <!-- struct OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-646'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22088,10 +22088,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::SingleSubst -->
-      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-901'>
+      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-831'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-992'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-980'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
@@ -22108,61 +22108,61 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::SingleSubstFormat1 format1; OT::SingleSubstFormat2 format2;} OT::SingleSubst::u -->
-          <var-decl name='u' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::SingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-993' is-artificial='yes'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22180,17 +22180,17 @@
       <!-- struct OT::OffsetArrayOf<OT::CaretValue> -->
       <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2308'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-805'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-856'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-805'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -22198,84 +22198,84 @@
         </data-member>
       </class-decl>
       <!-- struct OT::MultipleSubst -->
-      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-902'>
+      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-832'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-979'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-967'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::MultipleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::MultipleSubstFormat1 format1;} OT::MultipleSubst::u -->
-          <var-decl name='u' type-id='type-id-979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-634'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22286,82 +22286,82 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AlternateSubst -->
-      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-903'>
+      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-833'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-930'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-918'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AlternateSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::AlternateSubstFormat1 format1;} OT::AlternateSubst::u -->
-          <var-decl name='u' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValueFormat1 -->
-      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-827'>
+      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-877'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat1::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
@@ -22380,10 +22380,10 @@
         </data-member>
       </class-decl>
       <!-- struct OT::LigatureSubst -->
-      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-904'>
+      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-834'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-977'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-965'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
@@ -22396,263 +22396,263 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::LigatureSubstFormat1 format1;} OT::LigatureSubst::u -->
-          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-978' is-artificial='yes'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Context -->
-      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-974'>
+      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-962'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1021'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1016'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ContextFormat1 format1; OT::ContextFormat2 format2; OT::ContextFormat3 format3;} OT::Context::u -->
-          <var-decl name='u' type-id='type-id-1021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Context::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::Context::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ChainContext -->
-      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-970'>
+      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-958'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1016'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1011'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ChainContextFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-1019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ChainContextFormat1 format1; OT::ChainContextFormat2 format2; OT::ChainContextFormat3 format3;} OT::ChainContext::u -->
-          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1011' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::ChainContext::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ReverseChainSingleSubst -->
-      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-908'>
+      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-838'>
         <member-type access='protected'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} -->
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-989'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-977'>
             <data-member access='private'>
               <!-- OT::USHORT format -->
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::ReverseChainSingleSubstFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- union {OT::USHORT format; OT::ReverseChainSingleSubstFormat1 format1;} OT::ReverseChainSingleSubst::u -->
-          <var-decl name='u' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890'/>
+            <parameter type-id='type-id-820'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894'/>
+            <parameter type-id='type-id-824'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-991' is-artificial='yes'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::CaretValueFormat2 -->
-      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-828'>
+      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-878'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat2::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
@@ -22671,7 +22671,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::CaretValueFormat3 -->
-      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-829'>
+      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-879'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CaretValueFormat3::caretValueFormat -->
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
@@ -22704,15 +22704,15 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::CaretValueFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
+              <var-decl name='format1' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::CaretValueFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
+              <var-decl name='format2' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::CaretValueFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
+              <var-decl name='format3' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -22728,7 +22728,7 @@
       <!-- struct OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-659'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22741,7 +22741,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-653'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22754,7 +22754,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-655'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22767,7 +22767,7 @@
       <!-- struct OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-630'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22778,7 +22778,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AnchorFormat1 -->
-      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-791'>
+      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-842'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
@@ -22801,7 +22801,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AnchorFormat2 -->
-      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-792'>
+      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-843'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
@@ -22828,7 +22828,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AnchorFormat3 -->
-      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-793'>
+      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-844'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorFormat3::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
@@ -22869,15 +22869,15 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::AnchorFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
+              <var-decl name='format1' type-id='type-id-842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AnchorFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
+              <var-decl name='format2' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::AnchorFormat3 format3 -->
-              <var-decl name='format3' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
+              <var-decl name='format3' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -22893,7 +22893,7 @@
       <!-- struct OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-650'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -22906,17 +22906,17 @@
       <!-- struct OT::MarkArray -->
       <class-decl name='MarkArray' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1632'>
         <!-- struct OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-802'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-853'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-802'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-853'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::MarkRecord OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -22924,7 +22924,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::MarkRecord -->
-      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-850'>
+      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-900'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkRecord::klass -->
           <var-decl name='klass' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
@@ -22943,14 +22943,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::AnchorMatrix -->
-      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-794'>
+      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-845'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::AnchorMatrix::rows -->
           <var-decl name='rows' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > OT::AnchorMatrix::matrixZ[1] -->
-          <var-decl name='matrixZ' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorMatrix::min_size -->
@@ -22995,7 +22995,7 @@
       <!-- struct OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-631'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23008,7 +23008,7 @@
       <!-- struct OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-647'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23021,7 +23021,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-652'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23049,7 +23049,7 @@
       <!-- struct OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-654'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23062,7 +23062,7 @@
       <!-- struct OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-661'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23075,7 +23075,7 @@
       <!-- struct OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-648'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23097,11 +23097,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::USHORT OT::Rule::inputZ[1] -->
-          <var-decl name='inputZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
+          <var-decl name='inputZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::LookupRecord OT::Rule::lookupRecordX[1] -->
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Rule::min_size -->
@@ -23131,11 +23131,11 @@
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1068' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1067'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1062'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_closure_context_t::max_debug_depth -->
@@ -23147,11 +23147,11 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_closure_context_t::glyphs -->
-          <var-decl name='glyphs' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- OT::hb_closure_context_t::recurse_func_t OT::hb_closure_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1067' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1062' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- unsigned int OT::hb_closure_context_t::nesting_level_left -->
@@ -23165,11 +23165,11 @@
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -23180,132 +23180,132 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
-            <return type-id='type-id-895'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -23313,11 +23313,11 @@
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
           <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1070' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1069'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1065' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1064'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_collect_glyphs_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
@@ -23329,27 +23329,27 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::before -->
-          <var-decl name='before' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::input -->
-          <var-decl name='input' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::after -->
-          <var-decl name='after' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::output -->
-          <var-decl name='output' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- OT::hb_collect_glyphs_context_t::recurse_func_t OT::hb_collect_glyphs_context_t::recurse_func -->
-          <var-decl name='recurse_func' type-id='type-id-1069' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1064' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <!-- hb_set_t OT::hb_collect_glyphs_context_t::recursed_lookups -->
-          <var-decl name='recursed_lookups' type-id='type-id-1071' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1066' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <!-- unsigned int OT::hb_collect_glyphs_context_t::nesting_level_left -->
@@ -23363,17 +23363,17 @@
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'hb_set_t*' -->
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- void -->
@@ -23384,7 +23384,7 @@
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <!-- void -->
@@ -23395,220 +23395,220 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1063'/>
+            <parameter type-id='type-id-1058'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1064'/>
+            <parameter type-id='type-id-1059'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1059'/>
+            <parameter type-id='type-id-1054'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1055'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1056'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1062'/>
+            <parameter type-id='type-id-1057'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1065'/>
+            <parameter type-id='type-id-1060'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1066'/>
+            <parameter type-id='type-id-1061'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -23616,7 +23616,7 @@
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
           <!-- typedef bool OT::hb_would_apply_context_t::return_t -->
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
@@ -23646,7 +23646,7 @@
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-144'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
@@ -23663,149 +23663,149 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1047'/>
+            <parameter type-id='type-id-1042'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1048'/>
+            <parameter type-id='type-id-1043'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1049'/>
+            <parameter type-id='type-id-1044'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-1045'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1051'/>
+            <parameter type-id='type-id-1046'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1052'/>
+            <parameter type-id='type-id-1047'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1053'/>
+            <parameter type-id='type-id-1048'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1049'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1050'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1056'/>
+            <parameter type-id='type-id-1051'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1057'/>
+            <parameter type-id='type-id-1052'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1053'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
-            <return type-id='type-id-891'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Sequence> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1028'>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1023'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-868'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-868'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -23815,7 +23815,7 @@
       <!-- struct OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-664'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23837,34 +23837,34 @@
         </data-member>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Coverage> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1029'>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1024'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-808'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-859'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::LigatureSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-879'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-808'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-621'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::Ligature> -->
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-878'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-807'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-620'/>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::RuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1101'>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1080'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-816'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-816'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-867'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -23874,7 +23874,7 @@
       <!-- struct OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-662'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -23898,17 +23898,17 @@
       <!-- struct OT::OffsetArrayOf<OT::Rule> -->
       <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2314'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-815'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-866'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-815'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-866'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -23974,21 +23974,21 @@
         </data-member>
       </class-decl>
       <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::match_func_t -->
-      <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-2320'/>
+      <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-2320'/>
       <!-- struct OT::OffsetArrayOf<OT::ChainRuleSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1100'>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1079'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-858'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-807'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-858'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -23998,7 +23998,7 @@
       <!-- struct OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-636'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -24022,17 +24022,17 @@
       <!-- struct OT::OffsetArrayOf<OT::ChainRule> -->
       <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2321'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-857'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-806'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-857'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -24042,7 +24042,7 @@
       <!-- struct OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-635'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -24068,7 +24068,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <!-- OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > OT::ChainRule::lookupX -->
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainRule::min_size -->
@@ -24076,14 +24076,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-801'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-852'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::LookupRecord OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -24124,7 +24124,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::SinglePosFormat1 -->
-      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-857'>
+      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-907'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
@@ -24135,11 +24135,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat1::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueRecord OT::SinglePosFormat1::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat1::min_size -->
@@ -24147,12 +24147,12 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ValueFormat -->
-      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-982'>
+      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-970'>
         <!-- struct OT::IntType<short unsigned int, 2u> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <member-type access='public'>
           <!-- enum OT::ValueFormat::Flags -->
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1032'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1027'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -24171,9 +24171,9 @@
       <!-- typedef OT::USHORT OT::Value -->
       <typedef-decl name='Value' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-1077'/>
       <!-- typedef Value[1] OT::ValueRecord -->
-      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-984'/>
+      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-972'/>
       <!-- struct OT::SinglePosFormat2 -->
-      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-858'>
+      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-908'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::SinglePosFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
@@ -24184,7 +24184,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::SinglePosFormat2::valueFormat -->
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::USHORT OT::SinglePosFormat2::valueCount -->
@@ -24192,7 +24192,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::ValueRecord OT::SinglePosFormat2::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat2::min_size -->
@@ -24200,7 +24200,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::CursivePosFormat1 -->
-      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1109'>
+      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1112'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::CursivePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
@@ -24211,7 +24211,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > OT::CursivePosFormat1::entryExitRecord -->
-          <var-decl name='entryExitRecord' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CursivePosFormat1::min_size -->
@@ -24219,14 +24219,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-797'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-848'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::EntryExitRecord OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -24253,7 +24253,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::MarkBasePosFormat1 -->
-      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-847'>
+      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-897'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkBasePosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
@@ -24288,7 +24288,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::MarkLigPosFormat1 -->
-      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-848'>
+      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-898'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkLigPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
@@ -24323,7 +24323,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::MarkMarkPosFormat1 -->
-      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-849'>
+      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-899'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::MarkMarkPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
@@ -24358,7 +24358,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::PairPosFormat1 -->
-      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-851'>
+      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-901'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat1::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
@@ -24369,15 +24369,15 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat1::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetArrayOf<OT::PairSet> OT::PairPosFormat1::pairSet -->
-          <var-decl name='pairSet' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat1::min_size -->
@@ -24385,19 +24385,19 @@
         </data-member>
       </class-decl>
       <!-- struct OT::OffsetArrayOf<OT::PairSet> -->
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-983'>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-971'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-863'/>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-812'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-863'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -24407,13 +24407,13 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<OT::PairSet::sanitize_closure_t*>(OT::hb_sanitize_context_t*, void*, OT::PairSet::sanitize_closure_t*) -->
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24422,7 +24422,7 @@
       <!-- struct OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-656'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -24441,14 +24441,14 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::PairSet -->
-      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-853'>
+      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-903'>
         <member-type access='public'>
           <!-- struct OT::PairSet::sanitize_closure_t -->
           <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-912'>
@@ -24458,7 +24458,7 @@
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <!-- OT::ValueFormat* OT::PairSet::sanitize_closure_t::valueFormats -->
-              <var-decl name='valueFormats' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <!-- unsigned int OT::PairSet::sanitize_closure_t::len1 -->
@@ -24476,7 +24476,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::PairSet::arrayZ[1] -->
-          <var-decl name='arrayZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairSet::min_size -->
@@ -24484,7 +24484,7 @@
         </data-member>
       </class-decl>
       <!-- struct OT::PairPosFormat2 -->
-      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-852'>
+      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-902'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- OT::USHORT OT::PairPosFormat2::format -->
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
@@ -24495,11 +24495,11 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat1 -->
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <!-- OT::ValueFormat OT::PairPosFormat2::valueFormat2 -->
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <!-- OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > OT::PairPosFormat2::classDef1 -->
@@ -24519,7 +24519,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <!-- OT::ValueRecord OT::PairPosFormat2::values -->
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat2::min_size -->
@@ -24527,24 +24527,24 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ContextSubst -->
-      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-905'>
+      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-835'>
         <!-- struct OT::Context -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
       <!-- struct OT::ChainContextSubst -->
-      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-906'>
+      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-836'>
         <!-- struct OT::ChainContext -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
       <!-- struct OT::ExtensionSubst -->
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-907'>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-837'>
         <!-- struct OT::Extension<OT::ExtensionSubst> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-658'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -24580,11 +24580,11 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::SinglePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
+              <var-decl name='format1' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::SinglePosFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
+              <var-decl name='format2' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24598,9 +24598,9 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-2196' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24609,9 +24609,9 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-2196' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24620,9 +24620,9 @@
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
             <parameter type-id='type-id-2196' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24637,11 +24637,11 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::PairPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
+              <var-decl name='format1' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
             </data-member>
             <data-member access='private'>
               <!-- OT::PairPosFormat2 format2 -->
-              <var-decl name='format2' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
+              <var-decl name='format2' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24655,9 +24655,9 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-2134' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24666,9 +24666,9 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-2134' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24677,9 +24677,9 @@
             <!-- implicit parameter of type 'const OT::PairPos*' -->
             <parameter type-id='type-id-2134' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24694,7 +24694,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::CursivePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
+              <var-decl name='format1' type-id='type-id-1112' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24708,9 +24708,9 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24719,9 +24719,9 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24730,9 +24730,9 @@
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
             <parameter type-id='type-id-1969' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24747,7 +24747,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::MarkBasePosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
+              <var-decl name='format1' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24761,9 +24761,9 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-2045' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24772,9 +24772,9 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-2045' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24783,9 +24783,9 @@
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
             <parameter type-id='type-id-2045' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24800,7 +24800,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::MarkLigPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
+              <var-decl name='format1' type-id='type-id-898' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24814,9 +24814,9 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-2055' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24825,9 +24825,9 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-2055' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24836,9 +24836,9 @@
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
             <parameter type-id='type-id-2055' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -24853,7 +24853,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::MarkMarkPosFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
+              <var-decl name='format1' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24867,9 +24867,9 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-2058' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24878,9 +24878,9 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-2058' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24889,21 +24889,21 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
             <parameter type-id='type-id-2058' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::ContextPos -->
       <class-decl name='ContextPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-2328'>
         <!-- struct OT::Context -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
       <!-- struct OT::ChainContextPos -->
       <class-decl name='ChainContextPos' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-2329'>
         <!-- struct OT::ChainContext -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
       <!-- struct OT::ExtensionPos -->
       <class-decl name='ExtensionPos' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-2330'>
@@ -24921,7 +24921,7 @@
             </data-member>
             <data-member access='private'>
               <!-- OT::ExtensionFormat1 format1 -->
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -24944,9 +24944,9 @@
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
             <parameter type-id='type-id-1978' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25035,18 +25035,18 @@
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
             <parameter type-id='type-id-2146' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-12'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-649'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -25059,7 +25059,7 @@
       <!-- struct OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-667'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -25072,7 +25072,7 @@
       <!-- struct OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-657'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -25092,7 +25092,7 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-2142' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <!-- void -->
             <return type-id='type-id-13'/>
           </function-decl>
@@ -25103,9 +25103,9 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-2142' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-892'/>
+            <parameter type-id='type-id-822'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-            <return type-id='type-id-893'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25114,16 +25114,16 @@
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
             <parameter type-id='type-id-2142' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-826'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
-            <return type-id='type-id-897'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-663'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -25142,17 +25142,17 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::Script>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-885'/>
+            <parameter type-id='type-id-814'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Record<OT::Script> -->
-      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-856'>
+      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Script>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-988'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-976'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Script>::tag -->
@@ -25174,7 +25174,7 @@
       <!-- struct OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-642'>
         <!-- struct OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::static_size -->
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
@@ -25193,17 +25193,17 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-33'/>
             <!-- parameter of type 'const OT::Record<OT::Feature>::sanitize_closure_t*' -->
-            <parameter type-id='type-id-882'/>
+            <parameter type-id='type-id-811'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::Record<OT::Feature> -->
-      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-854'>
+      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-904'>
         <member-type access='public'>
           <!-- struct OT::Record<OT::Feature>::sanitize_closure_t -->
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-986'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-974'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Tag OT::Record<OT::Feature>::tag -->
@@ -25223,14 +25223,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-823'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-873'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Script> OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25238,14 +25238,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-798'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-849'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Index OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25262,14 +25262,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-822'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-872'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::LangSys> OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-953' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25277,14 +25277,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-821'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-871'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::Record<OT::Feature> OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25292,14 +25292,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-811'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-862'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25307,14 +25307,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-818'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-869'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25322,14 +25322,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-813'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-864'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25337,14 +25337,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-814'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-865'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-943' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25354,7 +25354,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-956' is-artificial='yes'/>
+            <parameter type-id='type-id-944' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -25367,14 +25367,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-803'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-854'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::IntType<short unsigned int, 2u> OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::len -->
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::array[1] -->
-          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::min_size -->
@@ -25384,7 +25384,7 @@
           <!-- bool OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sanitize<unsigned int>(OT::hb_sanitize_context_t*, void*, unsigned int) -->
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-943' is-artificial='yes'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-309'/>
             <!-- parameter of type 'void*' -->
@@ -25399,7 +25399,7 @@
       <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2203'>
         <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-822'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-872'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25420,7 +25420,7 @@
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2206'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-823'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-873'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25441,7 +25441,7 @@
       <!-- struct OT::OffsetArrayOf<OT::Lookup> -->
       <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2335'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-811'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Feature> -->
       <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-2155'>
@@ -25451,7 +25451,7 @@
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2336'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-821'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-871'/>
       </class-decl>
       <!-- struct OT::RecordListOf<OT::Feature> -->
       <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1765'>
@@ -25459,9 +25459,9 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2155'/>
       </class-decl>
       <!-- struct OT::IndexArray -->
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-976'>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-964'>
         <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-798'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Script> -->
       <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-2163'>
@@ -25489,14 +25489,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::Feature -->
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-842'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-892'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > OT::Feature::featureParams -->
           <var-decl name='featureParams' type-id='type-id-643' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IndexArray OT::Feature::lookupIndex -->
-          <var-decl name='lookupIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Feature::min_size -->
@@ -25511,7 +25511,7 @@
       <!-- struct OT::OffsetArrayOf<OT::SubstLookup> -->
       <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2337'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-818'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-869'/>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::AnchorMatrix> -->
       <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1666'>
@@ -25534,7 +25534,7 @@
       <!-- struct OT::OffsetArrayOf<OT::AnchorMatrix> -->
       <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2338'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-803'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-854'/>
       </class-decl>
       <!-- struct OT::OffsetListOf<OT::PosLookup> -->
       <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1673'>
@@ -25544,13 +25544,13 @@
       <!-- struct OT::OffsetArrayOf<OT::PosLookup> -->
       <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2339'>
         <!-- struct OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-813'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-864'/>
       </class-decl>
       <!-- struct OT::LangSys -->
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-846'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-896'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- OT::Offset<OT::IntType<short unsigned int, 2u> > OT::LangSys::lookupOrderZ -->
-          <var-decl name='lookupOrderZ' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-810' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::USHORT OT::LangSys::reqFeatureIndex -->
@@ -25558,7 +25558,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IndexArray OT::LangSys::featureIndex -->
-          <var-decl name='featureIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LangSys::min_size -->
@@ -25929,7 +25929,7 @@
       <!-- parameter of type 'enum hb_ot_layout_glyph_class_t' -->
       <parameter type-id='type-id-1425' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -25959,7 +25959,7 @@
       <!-- parameter of type 'const hb_tag_t*' -->
       <parameter type-id='type-id-2281' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
+      <parameter type-id='type-id-804' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -25972,13 +25972,13 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='637' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -25989,7 +25989,7 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='719' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -26015,7 +26015,7 @@
     <!-- bool (hb_set_t*, const OT::USHORT&, void*) -->
     <function-type size-in-bits='64' id='type-id-1878'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875'/>
+      <parameter type-id='type-id-804'/>
       <!-- parameter of type 'const OT::USHORT&' -->
       <parameter type-id='type-id-2212'/>
       <!-- parameter of type 'void*' -->
@@ -26037,29 +26037,29 @@
     <!-- OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1106'>
       <!-- parameter of type 'OT::hb_apply_context_t*' -->
-      <parameter type-id='type-id-896'/>
+      <parameter type-id='type-id-826'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- typedef OT::hb_apply_context_t::return_t -->
-      <return type-id='type-id-897'/>
+      <return type-id='type-id-827'/>
     </function-type>
     <!-- OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1107'>
       <!-- parameter of type 'OT::hb_closure_context_t*' -->
-      <parameter type-id='type-id-894'/>
+      <parameter type-id='type-id-824'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- typedef OT::hb_closure_context_t::return_t -->
-      <return type-id='type-id-895'/>
+      <return type-id='type-id-825'/>
     </function-type>
     <!-- OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int) -->
     <function-type size-in-bits='64' id='type-id-1108'>
       <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-      <parameter type-id='type-id-892'/>
+      <parameter type-id='type-id-822'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12'/>
       <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
-      <return type-id='type-id-893'/>
+      <return type-id='type-id-823'/>
     </function-type>
     <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
     <function-type size-in-bits='64' id='type-id-2301'>
@@ -26075,7 +26075,7 @@
     <!-- void (hb_set_t*, const OT::USHORT&, void*) -->
     <function-type size-in-bits='64' id='type-id-2302'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875'/>
+      <parameter type-id='type-id-804'/>
       <!-- parameter of type 'const OT::USHORT&' -->
       <parameter type-id='type-id-2212'/>
       <!-- parameter of type 'void*' -->
@@ -26816,7 +26816,7 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-223' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
+      <parameter type-id='type-id-804' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -26831,7 +26831,7 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='773' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -26925,15 +26925,15 @@
   </abi-instr>
   <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- elt_t[2048] -->
-    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
+    <array-type-def dimensions='1' type-id='type-id-1067' size-in-bits='65536' id='type-id-1068'>
       <!-- <anonymous range>[2048] -->
-      <subrange length='2048' type-id='type-id-4' id='type-id-1099'/>
+      <subrange length='2048' type-id='type-id-4' id='type-id-1105'/>
     </array-type-def>
     <!-- struct hb_set_t -->
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-929'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-997'>
       <member-type access='public'>
         <!-- typedef uint32_t hb_set_t::elt_t -->
-        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1072'/>
+        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1067'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_set_t::header -->
@@ -26969,27 +26969,27 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
         <!-- hb_set_t::elt_t hb_set_t::elts[2048] -->
-        <var-decl name='elts' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-1068' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef hb_set_t hb_set_t -->
-    <typedef-decl name='hb_set_t' type-id='type-id-929' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1071'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-997' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1066'/>
     <!-- const hb_set_t -->
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-2437'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-2437'/>
     <!-- const hb_set_t* -->
     <pointer-type-def type-id='type-id-2437' size-in-bits='64' id='type-id-2438'/>
     <!-- const hb_set_t* const -->
     <qualified-type-def type-id='type-id-2438' const='yes' id='type-id-2439'/>
     <!-- hb_set_t* -->
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-875'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-804'/>
     <!-- hb_set_t* const -->
-    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-2440'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-2440'/>
     <!-- hb_set_t::elt_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-2441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-2441'/>
     <!-- hb_set_t* hb_set_get_empty() -->
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
       <!-- hb_set_t* -->
-      <return type-id='type-id-875'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <!-- hb_bool_t hb_set_allocation_successful(const hb_set_t*) -->
     <function-decl name='hb_set_allocation_successful' mangled-name='hb_set_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_allocation_successful'>
@@ -27040,14 +27040,14 @@
     <!-- void hb_set_invert(hb_set_t*) -->
     <function-decl name='hb_set_invert' mangled-name='hb_set_invert' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_invert'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
     <!-- void hb_set_symmetric_difference(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_symmetric_difference' mangled-name='hb_set_symmetric_difference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_symmetric_difference'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
@@ -27056,7 +27056,7 @@
     <!-- void hb_set_subtract(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_subtract' mangled-name='hb_set_subtract' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_subtract'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
@@ -27065,7 +27065,7 @@
     <!-- void hb_set_intersect(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_intersect' mangled-name='hb_set_intersect' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_intersect'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
@@ -27074,7 +27074,7 @@
     <!-- void hb_set_union(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_union' mangled-name='hb_set_union' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_union'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
@@ -27083,7 +27083,7 @@
     <!-- void hb_set_set(hb_set_t*, const hb_set_t*) -->
     <function-decl name='hb_set_set' mangled-name='hb_set_set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <!-- void -->
@@ -27092,7 +27092,7 @@
     <!-- void hb_set_del_range(hb_set_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_set_del_range' mangled-name='hb_set_del_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del_range'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -27103,7 +27103,7 @@
     <!-- void hb_set_del(hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_del' mangled-name='hb_set_del' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <!-- void -->
@@ -27112,7 +27112,7 @@
     <!-- void hb_set_add_range(hb_set_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_set_add_range' mangled-name='hb_set_add_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add_range'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -27123,7 +27123,7 @@
     <!-- void hb_set_add(hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_add' mangled-name='hb_set_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <!-- void -->
@@ -27139,14 +27139,14 @@
     <!-- void hb_set_clear(hb_set_t*) -->
     <function-decl name='hb_set_clear' mangled-name='hb_set_clear' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_clear'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
     <!-- void* hb_set_get_user_data(hb_set_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_set_get_user_data' mangled-name='hb_set_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_user_data'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-37' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='136' column='1'/>
       <!-- void* -->
@@ -27155,7 +27155,7 @@
     <!-- hb_bool_t hb_set_set_user_data(hb_set_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_set_set_user_data' mangled-name='hb_set_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set_user_data'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-37' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='117' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -27170,21 +27170,21 @@
     <!-- hb_set_t* hb_set_reference(hb_set_t*) -->
     <function-decl name='hb_set_reference' mangled-name='hb_set_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_reference'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
       <!-- hb_set_t* -->
-      <return type-id='type-id-875'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <!-- void hb_set_destroy(hb_set_t*) -->
     <function-decl name='hb_set_destroy' mangled-name='hb_set_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_destroy'>
       <!-- parameter of type 'hb_set_t*' -->
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <!-- void -->
       <return type-id='type-id-13'/>
     </function-decl>
     <!-- hb_set_t* hb_set_create() -->
     <function-decl name='hb_set_create' mangled-name='hb_set_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_create'>
       <!-- hb_set_t* -->
-      <return type-id='type-id-875'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <!-- hb_bool_t hb_set_next_range(const hb_set_t*, hb_codepoint_t*, hb_codepoint_t*) -->
     <function-decl name='hb_set_next_range' mangled-name='hb_set_next_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next_range'>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 11d0c845..c086b8f6 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -5430,6 +5430,19 @@
     </function-decl>
     <!-- GLfloat* -->
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-57'/>
+    <namespace-decl name='std'>
+      <!-- struct std::__false_type -->
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::forward_iterator_tag -->
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
+        <!-- struct std::input_iterator_tag -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-320'/>
+      </class-decl>
+    </namespace-decl>
+    <!-- struct vtkAbstractArray -->
+    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-242'/>
     <!-- class vtkDataArray -->
     <class-decl name='vtkDataArray' visibility='default' is-declaration-only='yes' id='type-id-247'/>
     <!-- class vtkDataSet -->
@@ -5440,12 +5453,18 @@
     <class-decl name='vtkImageData' visibility='default' is-declaration-only='yes' id='type-id-258'/>
     <!-- class vtkImageNoiseSource -->
     <class-decl name='vtkImageNoiseSource' visibility='default' is-declaration-only='yes' id='type-id-260'/>
+    <!-- struct vtkInformation -->
+    <class-decl name='vtkInformation' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-261'/>
     <!-- class vtkInformationVector -->
     <class-decl name='vtkInformationVector' visibility='default' is-declaration-only='yes' id='type-id-262'/>
     <!-- class vtkOpenGLRenderWindow -->
     <class-decl name='vtkOpenGLRenderWindow' visibility='default' is-declaration-only='yes' id='type-id-264'/>
     <!-- class vtkPointData -->
     <class-decl name='vtkPointData' visibility='default' is-declaration-only='yes' id='type-id-275'/>
+    <!-- struct vtkProgressObserver -->
+    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
+    <!-- struct vtkRenderWindow -->
+    <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-279'/>
     <!-- class vtkShaderProgram2 -->
     <class-decl name='vtkShaderProgram2' visibility='default' is-declaration-only='yes' id='type-id-281'/>
     <!-- class vtkWeakPointer<vtkImageDataLIC2D> -->
@@ -5456,7 +5475,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer() -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-27'/>
         </function-decl>
@@ -5465,7 +5484,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(vtkImageDataLIC2D*) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'vtkImageDataLIC2D*' -->
           <parameter type-id='type-id-66'/>
           <!-- void -->
@@ -5476,7 +5495,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(const vtkWeakPointerBase&) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'const vtkWeakPointerBase&' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
@@ -5487,7 +5506,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(vtkImageDataLIC2D*, const vtkWeakPointerBase::NoReference&) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'vtkImageDataLIC2D*' -->
           <parameter type-id='type-id-66'/>
           <!-- parameter of type 'const vtkWeakPointerBase::NoReference&' -->
@@ -5502,9 +5521,9 @@
     <!-- const std::deque<vtkPixelExtent, std::allocator<vtkPixelExtent> >& -->
     <qualified-type-def type-id='type-id-182' id='type-id-309'/>
     <!-- const vtkImageDataLIC2DExtentTranslator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-64'/>
+    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-64'/>
     <!-- const vtkImageDataLIC2DExtentTranslator* -->
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-67'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-67'/>
     <!-- int (void*, void*) -->
     <function-type size-in-bits='64' id='type-id-205'>
       <!-- parameter of type 'void*' -->
@@ -5522,29 +5541,10 @@
     <!-- int[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-4' id='type-id-322'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-323'/>
     </array-type-def>
     <!-- std::_Deque_iterator<vtkPixelExtent, const vtkPixelExtent&, const vtkPixelExtent*>* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-311'/>
-    <namespace-decl name='std'>
-      <!-- struct std::__false_type -->
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- struct std::forward_iterator_tag -->
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
-        <!-- struct std::input_iterator_tag -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-323'/>
-      </class-decl>
-    </namespace-decl>
-    <!-- struct vtkAbstractArray -->
-    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-242'/>
-    <!-- struct vtkInformation -->
-    <class-decl name='vtkInformation' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-261'/>
-    <!-- struct vtkProgressObserver -->
-    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
-    <!-- struct vtkRenderWindow -->
-    <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-279'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-316'/>
     <!-- vtkImageDataLIC2DExtentTranslator* const -->
@@ -5553,22 +5553,22 @@
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-313'/>
     <!-- vtkPixelTransfer::VTK_TT* -->
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
-    <!-- const vtkImageDataLIC2DExtentTranslator -->
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-321'/>
     <namespace-decl name='std'>
       <!-- struct std::input_iterator_tag -->
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-323'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-320'/>
     </namespace-decl>
+    <!-- const vtkImageDataLIC2DExtentTranslator -->
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-322'/>
     <!-- typedef float GLfloat -->
     <typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-319'/>
     <!-- vtkWeakPointer<vtkImageDataLIC2D>* -->
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-321'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- int[6] -->
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-4' id='type-id-322'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-323'/>
     </array-type-def>
     <!-- class vtkWeakPointer<vtkImageDataLIC2D> -->
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-62'>
@@ -5578,7 +5578,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer() -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-27'/>
         </function-decl>
@@ -5587,7 +5587,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(vtkImageDataLIC2D*) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'vtkImageDataLIC2D*' -->
           <parameter type-id='type-id-66'/>
           <!-- void -->
@@ -5598,7 +5598,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(const vtkWeakPointerBase&) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'const vtkWeakPointerBase&' -->
           <parameter type-id='type-id-77'/>
           <!-- void -->
@@ -5609,7 +5609,7 @@
         <!-- void vtkWeakPointer<vtkImageDataLIC2D>::vtkWeakPointer(vtkImageDataLIC2D*, const vtkWeakPointerBase::NoReference&) -->
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'vtkWeakPointer<vtkImageDataLIC2D>*' -->
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <!-- parameter of type 'vtkImageDataLIC2D*' -->
           <parameter type-id='type-id-66'/>
           <!-- parameter of type 'const vtkWeakPointerBase::NoReference&' -->
@@ -5628,11 +5628,11 @@
     <!-- const std::ctype<char>* const -->
     <qualified-type-def type-id='type-id-327' const='yes' id='type-id-328'/>
     <!-- const vtkImageDataLIC2DExtentTranslator -->
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-321'/>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-322'/>
     <!-- const vtkImageDataLIC2DExtentTranslator& -->
-    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-64'/>
+    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-64'/>
     <!-- const vtkImageDataLIC2DExtentTranslator* -->
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-67'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-67'/>
     <!-- const vtkWeakPointer<vtkImageDataLIC2D> -->
     <qualified-type-def type-id='type-id-62' const='yes' id='type-id-329'/>
     <!-- const vtkWeakPointer<vtkImageDataLIC2D>* -->
@@ -5648,9 +5648,9 @@
     <!-- vtkWeakPointer<vtkImageDataLIC2D>& -->
     <reference-type-def kind='lvalue' type-id='type-id-62' size-in-bits='64' id='type-id-335'/>
     <!-- vtkWeakPointer<vtkImageDataLIC2D>* -->
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-321'/>
     <!-- vtkWeakPointer<vtkImageDataLIC2D>* const -->
-    <qualified-type-def type-id='type-id-320' const='yes' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-321' const='yes' id='type-id-336'/>
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- class std::ctype<char> -->
@@ -7092,7 +7092,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-308'/>
       </class-decl>
       <!-- struct std::input_iterator_tag -->
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-323'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-320'/>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-410'>
         <member-type access='private'>
@@ -7699,7 +7699,7 @@
       <!-- struct std::forward_iterator_tag -->
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
         <!-- struct std::input_iterator_tag -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-323'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-320'/>
       </class-decl>
       <!-- struct std::__false_type -->
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
@@ -11869,12 +11869,26 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <!-- struct vtkActor -->
+    <class-decl name='vtkActor' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-601'/>
     <!-- class vtkClipPlanesPainter -->
     <class-decl name='vtkClipPlanesPainter' visibility='default' is-declaration-only='yes' id='type-id-602'/>
     <!-- class vtkCoincidentTopologyResolutionPainter -->
     <class-decl name='vtkCoincidentTopologyResolutionPainter' visibility='default' is-declaration-only='yes' id='type-id-604'/>
+    <!-- struct vtkCompositePainter -->
+    <class-decl name='vtkCompositePainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-606'/>
+    <!-- struct vtkDisplayListPainter -->
+    <class-decl name='vtkDisplayListPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-609'/>
     <!-- class vtkGarbageCollector -->
     <class-decl name='vtkGarbageCollector' visibility='default' is-declaration-only='yes' id='type-id-611'/>
+    <!-- struct vtkLightingPainter -->
+    <class-decl name='vtkLightingPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-612'/>
+    <!-- struct vtkRenderer -->
+    <class-decl name='vtkRenderer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-615'/>
+    <!-- struct vtkRepresentationPainter -->
+    <class-decl name='vtkRepresentationPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-616'/>
+    <!-- struct vtkScalarsToColorsPainter -->
+    <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-618'/>
     <!-- class vtkSmartPointer<vtkBackgroundColorMonitor> -->
     <class-decl name='vtkSmartPointer&lt;vtkBackgroundColorMonitor&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointer.h' line='27' column='1' id='type-id-579'>
       <!-- class vtkSmartPointerBase -->
@@ -12315,20 +12329,6 @@
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-4' id='type-id-642'/>
     </array-type-def>
-    <!-- struct vtkActor -->
-    <class-decl name='vtkActor' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-601'/>
-    <!-- struct vtkCompositePainter -->
-    <class-decl name='vtkCompositePainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-606'/>
-    <!-- struct vtkDisplayListPainter -->
-    <class-decl name='vtkDisplayListPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-609'/>
-    <!-- struct vtkLightingPainter -->
-    <class-decl name='vtkLightingPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-612'/>
-    <!-- struct vtkRenderer -->
-    <class-decl name='vtkRenderer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-615'/>
-    <!-- struct vtkRepresentationPainter -->
-    <class-decl name='vtkRepresentationPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-616'/>
-    <!-- struct vtkScalarsToColorsPainter -->
-    <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-618'/>
     <!-- vtkSmartPointer<vtkOpenGLLightMonitor>[8] -->
     <array-type-def dimensions='1' type-id='type-id-643' size-in-bits='512' id='type-id-577'>
       <!-- <anonymous range>[8] -->
@@ -12444,12 +12444,12 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <!-- struct vtkWindow -->
+    <class-decl name='vtkWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
     <!-- const vtkSmartPointerBase::NoReference& -->
     <reference-type-def kind='lvalue' type-id='type-id-651' size-in-bits='64' id='type-id-627'/>
     <!-- const vtkSurfaceLICPainter -->
     <qualified-type-def type-id='type-id-572' const='yes' id='type-id-641'/>
-    <!-- struct vtkWindow -->
-    <class-decl name='vtkWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
     <!-- vtkBackgroundColorMonitor* -->
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-626'/>
     <!-- vtkColorMaterialHelper* -->
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 7cc6f1a8..a09035c1 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2350,8 +2350,6 @@
     <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-83'/>
     <!-- typedef long int intptr_t -->
     <typedef-decl name='intptr_t' type-id='type-id-85' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-82'/>
-    <!-- long int -->
-    <type-decl name='long int' size-in-bits='64' id='type-id-85'/>
     <class-decl name='LowLevelAlloc' size-in-bits='8' visibility='default' filepath='src/base/low_level_alloc.h' line='44' column='1' id='type-id-86'>
       <member-type access='private'>
         <!-- struct LowLevelAlloc::Arena -->
@@ -2407,6 +2405,8 @@
         </class-decl>
       </member-type>
     </class-decl>
+    <!-- long int -->
+    <type-decl name='long int' size-in-bits='64' id='type-id-85'/>
     <!-- class SpinLock -->
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-87'>
       <member-type access='private'>
@@ -3111,8 +3111,6 @@
         <return type-id='type-id-60'/>
       </function-decl>
     </namespace-decl>
-    <!-- const int -->
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-144'/>
     <namespace-decl name='tcmalloc'>
       <!-- struct tcmalloc::Span -->
       <class-decl name='Span' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/span.h' line='45' column='1' id='type-id-148'>
@@ -3163,6 +3161,8 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <!-- const int -->
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-144'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-151'/>
     <!-- tcmalloc::Span* -->
@@ -9987,197 +9987,6 @@
       <!-- <anonymous range>[48] -->
       <subrange length='48' type-id='type-id-5' id='type-id-928'/>
     </array-type-def>
-    <namespace-decl name='std'>
-      <!-- class std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
-        <member-type access='private'>
-          <!-- class std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::value_compare -->
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-929'/>
-        </member-type>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map() -->
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::less<HeapProfileTable::Bucket*>&, const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&) -->
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-            <parameter type-id='type-id-932'/>
-            <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <!-- parameter of type 'const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
-            <parameter type-id='type-id-934'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- class std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-      <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-935' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set() -->
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const MemoryRegionMap::RegionCmp&, const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-937'/>
-            <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-938'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <!-- parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-939'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <!-- const HeapProfileTable::AllocValue& -->
-    <qualified-type-def type-id='type-id-419' id='type-id-247'/>
-    <!-- const HeapProfileTable::AllocValue::Bucket& -->
-    <qualified-type-def type-id='type-id-423' id='type-id-249'/>
-    <!-- const HeapProfileTable::DumpArgs& -->
-    <qualified-type-def type-id='type-id-273' id='type-id-250'/>
-    <!-- const MemoryRegionMap::Region& -->
-    <qualified-type-def type-id='type-id-433' id='type-id-202'/>
-    <!-- const bool -->
-    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
-    <!-- const ptrdiff_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-940' size-in-bits='64' id='type-id-490'/>
-    <!-- const std::allocator<char>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-617'/>
-    <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-632'/>
-    <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-634'/>
-    <!-- const uintptr_t -->
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-259'/>
-    <!-- const unsigned long int -->
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-708'/>
-    <!-- const unsigned long int& -->
-    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
-    <!-- size_t (const HeapProfileTable::AllocValue&) -->
-    <function-type size-in-bits='64' id='type-id-836'>
-      <!-- parameter of type 'const HeapProfileTable::AllocValue&' -->
-      <parameter type-id='type-id-419'/>
-      <!-- typedef size_t -->
-      <return type-id='type-id-62'/>
-    </function-type>
-    <!-- void (const HeapProfileTable::AllocContextInfo&) -->
-    <function-type size-in-bits='64' id='type-id-848'>
-      <!-- parameter of type 'const HeapProfileTable::AllocContextInfo&' -->
-      <parameter type-id='type-id-415'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
-    <function-type size-in-bits='64' id='type-id-849'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
-      <parameter type-id='type-id-228'/>
-      <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
-      <parameter type-id='type-id-237'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, const HeapProfileTable::AllocInfo&) -->
-    <function-type size-in-bits='64' id='type-id-850'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'const HeapProfileTable::AllocInfo&' -->
-      <parameter type-id='type-id-417'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, ptrdiff_t) -->
-    <function-type size-in-bits='64' id='type-id-851'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef ptrdiff_t' -->
-      <parameter type-id='type-id-208'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, void*, size_t, int, int, int, off_t) -->
-    <function-type size-in-bits='64' id='type-id-853'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'typedef off_t' -->
-      <parameter type-id='type-id-207'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void* (size_t) -->
-    <function-type size-in-bits='64' id='type-id-855'>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- void* -->
-      <return type-id='type-id-58'/>
-    </function-type>
-    <!-- size_t* -->
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
-    <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region>* -->
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-868'/>
-    <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
-    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-869'/>
-    <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
-    <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-792'/>
     <namespace-decl name='std'>
       <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-917'>
@@ -10185,7 +9994,7 @@
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
           <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-636'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
             <data-member access='public' static='yes'>
               <!-- static const size_t std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_S_max_size -->
               <var-decl name='_S_max_size' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='51' column='1'/>
@@ -10202,9 +10011,9 @@
         </member-type>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-944'>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-930'>
             <!-- class std::allocator<char> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-931'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider::_M_p -->
               <var-decl name='_M_p' type-id='type-id-118' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='262' column='1'/>
@@ -10213,7 +10022,7 @@
               <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider::_Alloc_hider(char*, const std::allocator<char>&) -->
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider*' -->
-                <parameter type-id='type-id-946' is-artificial='yes'/>
+                <parameter type-id='type-id-932' is-artificial='yes'/>
                 <!-- parameter of type 'char*' -->
                 <parameter type-id='type-id-118'/>
                 <!-- parameter of type 'const std::allocator<char>&' -->
@@ -10226,7 +10035,7 @@
         </member-type>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
-          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-943'>
+          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-929'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- size_t std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base::_M_length -->
               <var-decl name='_M_length' type-id='type-id-62' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='142' column='1'/>
@@ -10247,7 +10056,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dataplus -->
-          <var-decl name='_M_dataplus' type-id='type-id-944' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string() -->
@@ -10368,44 +10177,235 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- typedef intptr_t AtomicWord -->
-    <typedef-decl name='AtomicWord' type-id='type-id-82' filepath='./src/base/atomicops.h' line='129' column='1' id='type-id-922'/>
-    <!-- typedef long int __off_t -->
-    <typedef-decl name='__off_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-301'/>
-    <!-- typedef unsigned long int pthread_t -->
-    <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-195'/>
-    <!-- typedef long int ptrdiff_t -->
-    <typedef-decl name='ptrdiff_t' type-id='type-id-85' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='149' column='1' id='type-id-208'/>
-    <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-947' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-291'/>
     <namespace-decl name='std'>
-      <!-- typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::string -->
-      <typedef-decl name='string' type-id='type-id-917' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-924'/>
+      <!-- class std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
+      <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
+        <member-type access='private'>
+          <!-- class std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::value_compare -->
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-933'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_M_t -->
+          <var-decl name='_M_t' type-id='type-id-934' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map() -->
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::less<HeapProfileTable::Bucket*>&, const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&) -->
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
+            <parameter type-id='type-id-936'/>
+            <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
+            <parameter type-id='type-id-937'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <!-- parameter of type 'const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
+            <parameter type-id='type-id-938'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
     </namespace-decl>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-176'/>
-    <!-- void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)* -->
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-199'/>
-    <!-- void (const MemoryRegionMap::Region&)* -->
-    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-201'/>
-    <!-- void (void*)* -->
-    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-234'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)* -->
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-269'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)* -->
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-270'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)* -->
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-274'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, char*)* -->
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-268'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)* -->
-    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-272'/>
-    <!-- void (void*, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-337'/>
-    <!-- void* (unsigned long int)* -->
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-263'/>
-    <!-- void*[20][32] -->
-    <array-type-def dimensions='2' type-id='type-id-58' size-in-bits='40960' id='type-id-198'>
+    <namespace-decl name='std'>
+      <!-- class std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
+      <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_t -->
+          <var-decl name='_M_t' type-id='type-id-939' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set() -->
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const MemoryRegionMap::RegionCmp&, const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
+            <parameter type-id='type-id-941'/>
+            <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
+            <parameter type-id='type-id-942'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <!-- parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
+            <parameter type-id='type-id-943'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <!-- const HeapProfileTable::AllocValue& -->
+    <qualified-type-def type-id='type-id-419' id='type-id-247'/>
+    <!-- const HeapProfileTable::AllocValue::Bucket& -->
+    <qualified-type-def type-id='type-id-423' id='type-id-249'/>
+    <!-- const HeapProfileTable::DumpArgs& -->
+    <qualified-type-def type-id='type-id-273' id='type-id-250'/>
+    <!-- const MemoryRegionMap::Region& -->
+    <qualified-type-def type-id='type-id-433' id='type-id-202'/>
+    <!-- const bool -->
+    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
+    <!-- const ptrdiff_t& -->
+    <reference-type-def kind='lvalue' type-id='type-id-944' size-in-bits='64' id='type-id-490'/>
+    <!-- const std::allocator<char>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-617'/>
+    <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-632'/>
+    <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-634'/>
+    <!-- const uintptr_t -->
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-259'/>
+    <!-- const unsigned long int -->
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-708'/>
+    <!-- const unsigned long int& -->
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
+    <!-- size_t (const HeapProfileTable::AllocValue&) -->
+    <function-type size-in-bits='64' id='type-id-836'>
+      <!-- parameter of type 'const HeapProfileTable::AllocValue&' -->
+      <parameter type-id='type-id-419'/>
+      <!-- typedef size_t -->
+      <return type-id='type-id-62'/>
+    </function-type>
+    <!-- void (const HeapProfileTable::AllocContextInfo&) -->
+    <function-type size-in-bits='64' id='type-id-848'>
+      <!-- parameter of type 'const HeapProfileTable::AllocContextInfo&' -->
+      <parameter type-id='type-id-415'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
+    <function-type size-in-bits='64' id='type-id-849'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
+      <parameter type-id='type-id-228'/>
+      <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
+      <parameter type-id='type-id-237'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, const HeapProfileTable::AllocInfo&) -->
+    <function-type size-in-bits='64' id='type-id-850'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'const HeapProfileTable::AllocInfo&' -->
+      <parameter type-id='type-id-417'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, ptrdiff_t) -->
+    <function-type size-in-bits='64' id='type-id-851'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef ptrdiff_t' -->
+      <parameter type-id='type-id-208'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, void*, size_t, int, int, int, off_t) -->
+    <function-type size-in-bits='64' id='type-id-853'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'typedef off_t' -->
+      <parameter type-id='type-id-207'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void* (size_t) -->
+    <function-type size-in-bits='64' id='type-id-855'>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- void* -->
+      <return type-id='type-id-58'/>
+    </function-type>
+    <!-- size_t* -->
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
+    <!-- std::_Rb_tree_iterator<MemoryRegionMap::Region>* -->
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-868'/>
+    <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-869'/>
+    <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
+    <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-792'/>
+    <!-- typedef intptr_t AtomicWord -->
+    <typedef-decl name='AtomicWord' type-id='type-id-82' filepath='./src/base/atomicops.h' line='129' column='1' id='type-id-922'/>
+    <!-- typedef long int __off_t -->
+    <typedef-decl name='__off_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-301'/>
+    <!-- typedef unsigned long int pthread_t -->
+    <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-195'/>
+    <!-- typedef long int ptrdiff_t -->
+    <typedef-decl name='ptrdiff_t' type-id='type-id-85' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='149' column='1' id='type-id-208'/>
+    <!-- typedef __ssize_t ssize_t -->
+    <typedef-decl name='ssize_t' type-id='type-id-947' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-291'/>
+    <namespace-decl name='std'>
+      <!-- typedef std::basic_string<char, std::char_traits<char>, std::allocator<char> > std::string -->
+      <typedef-decl name='string' type-id='type-id-917' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='56' column='1' id='type-id-924'/>
+    </namespace-decl>
+    <!-- void ()* -->
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-176'/>
+    <!-- void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)* -->
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-199'/>
+    <!-- void (const MemoryRegionMap::Region&)* -->
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-201'/>
+    <!-- void (void*)* -->
+    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-234'/>
+    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)* -->
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-269'/>
+    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)* -->
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-270'/>
+    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)* -->
+    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-274'/>
+    <!-- void (void*, HeapProfileTable::AllocValue*, char*)* -->
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-268'/>
+    <!-- void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)* -->
+    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-272'/>
+    <!-- void (void*, typedef size_t)* -->
+    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-337'/>
+    <!-- void* (unsigned long int)* -->
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-263'/>
+    <!-- void*[20][32] -->
+    <array-type-def dimensions='2' type-id='type-id-58' size-in-bits='40960' id='type-id-198'>
       <!-- <anonymous range>[20] -->
       <subrange length='20' type-id='type-id-5' id='type-id-926'/>
       <!-- <anonymous range>[32] -->
@@ -10757,7 +10757,7 @@
     </class-decl>
     <namespace-decl name='std'>
       <!-- class std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-930'>
+      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-934'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false> -->
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-968'>
@@ -10790,7 +10790,7 @@
                 <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false>*' -->
                 <parameter type-id='type-id-971' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-                <parameter type-id='type-id-932'/>
+                <parameter type-id='type-id-936'/>
                 <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
                 <parameter type-id='type-id-972'/>
                 <!-- void -->
@@ -10818,9 +10818,9 @@
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-973' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-            <parameter type-id='type-id-932'/>
+            <parameter type-id='type-id-936'/>
             <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -10901,7 +10901,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-935'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-939'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> -->
           <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-981'>
@@ -10934,7 +10934,7 @@
                 <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>*' -->
                 <parameter type-id='type-id-983' is-artificial='yes'/>
                 <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-                <parameter type-id='type-id-937'/>
+                <parameter type-id='type-id-941'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
                 <parameter type-id='type-id-984'/>
                 <!-- void -->
@@ -10962,9 +10962,9 @@
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
             <parameter type-id='type-id-985' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-937'/>
+            <parameter type-id='type-id-941'/>
             <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-942'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11021,7 +11021,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::allocator<char> -->
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-945'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-931'>
         <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
         <member-function access='private'>
@@ -11058,29 +11058,29 @@
       </class-decl>
     </namespace-decl>
     <!-- const MemoryRegionMap::RegionCmp& -->
-    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-937'/>
+    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-941'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-938'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-942'/>
     <!-- const ptrdiff_t -->
-    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-940'/>
+    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-944'/>
     <!-- const std::allocator<char> -->
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-941'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-945'/>
     <!-- const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-933'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-937'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-942'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-946'/>
     <!-- const std::less<HeapProfileTable::Bucket*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-936'/>
     <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-938'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-939'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-943'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider* -->
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
     <!-- std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-935'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-940'/>
     <!-- typedef long int __ssize_t -->
     <typedef-decl name='__ssize_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-947'/>
     <!-- MallocExtension::RangeFunction* -->
@@ -11159,86 +11159,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- class std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
-        <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1001'/>
-        <member-function access='private'>
-          <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator() -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator(const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
-            <parameter type-id='type-id-972'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::~allocator(int) -->
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <!-- artificial parameter of type 'int' -->
-            <parameter type-id='type-id-1' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <!-- const MemoryRegionMap::RegionCmp -->
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
-    <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-991'/>
-    <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-984'/>
-    <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-974'/>
-    <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-986'/>
-    <!-- const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-972'/>
-    <!-- const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-992'/>
-    <!-- const std::less<HeapProfileTable::Bucket*> -->
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
-    <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
-    <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
-    <qualified-type-def type-id='type-id-1009' id='type-id-977'/>
-    <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
-    <!-- int* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-963'/>
-    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-973'/>
-    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
-    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false>* -->
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-971'/>
-    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-985'/>
-    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
-    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>* -->
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
-    <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-976'/>
-    <!-- std::allocator<char>* -->
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-989'/>
-    <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-967'/>
     <namespace-decl name='std'>
       <!-- struct std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-980'>
@@ -11250,7 +11170,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11259,9 +11179,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11270,9 +11190,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1003'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11290,7 +11210,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11299,7 +11219,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
             <parameter type-id='type-id-976'/>
             <!-- void -->
@@ -11308,11 +11228,49 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- class std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
+        <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
+        <member-function access='private'>
+          <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator() -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator(const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
+            <parameter type-id='type-id-972'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::~allocator(int) -->
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <!-- artificial parameter of type 'int' -->
+            <parameter type-id='type-id-1' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::less<HeapProfileTable::Bucket*> -->
       <class-decl name='less&lt;HeapProfileTable::Bucket*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-970'>
         <!-- struct std::binary_function<HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1007'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
@@ -11330,7 +11288,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11339,9 +11297,9 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1003'/>
             <!-- parameter of type 'const bool&' -->
             <parameter type-id='type-id-488'/>
             <!-- void -->
@@ -11350,12 +11308,54 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- const MemoryRegionMap::RegionCmp -->
+    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
+    <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-991'/>
+    <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-984'/>
+    <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-974'/>
+    <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-986'/>
+    <!-- const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-972'/>
+    <!-- const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-992'/>
+    <!-- const std::less<HeapProfileTable::Bucket*> -->
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
+    <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
+    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
+    <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
+    <qualified-type-def type-id='type-id-1015' id='type-id-977'/>
+    <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
+    <!-- int* -->
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-963'/>
+    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-973'/>
+    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
+    <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false>* -->
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-971'/>
+    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-985'/>
+    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
+    <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>* -->
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
+    <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-976'/>
+    <!-- std::allocator<char>* -->
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-989'/>
+    <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-967'/>
     <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>* -->
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-998'/>
     <!-- __gnu_cxx::new_allocator<char>* -->
     <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-999'/>
     <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1003'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1009'>
       <member-function access='private'>
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::STL_Allocator() -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11371,7 +11371,7 @@
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
           <parameter type-id='type-id-1018' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-938'/>
+          <parameter type-id='type-id-942'/>
           <!-- void -->
           <return type-id='type-id-60'/>
         </function-decl>
@@ -11439,7 +11439,7 @@
     </class-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1001'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1005'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11473,9 +11473,13 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1016'/>
+    </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1008'>
+      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1014'>
         <!-- class __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1021'/>
         <member-function access='private'>
@@ -11493,7 +11497,7 @@
             <!-- implicit parameter of type 'std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
             <parameter type-id='type-id-1022' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11522,9 +11526,13 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::binary_function<HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool> -->
+      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1007'/>
+    </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
-      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1011'>
+      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1017'>
         <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
@@ -11600,43 +11608,35 @@
       </class-decl>
     </namespace-decl>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1004'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1010'/>
     <!-- const __gnu_cxx::new_allocator<char>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1030' size-in-bits='64' id='type-id-1000'/>
     <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1005'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1011'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1006'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1012'/>
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1014'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1003'/>
     <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1002'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1007'/>
+    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1013'/>
     <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1009'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1015'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1012'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1001'/>
     <!-- std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1004'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1002'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1006'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1017'/>
-    <namespace-decl name='std'>
-      <!-- struct std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1010'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- struct std::binary_function<HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool> -->
-      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1016'/>
-    </namespace-decl>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1008'/>
     <!-- typedef std::string MallocExtensionWriter -->
     <typedef-decl name='MallocExtensionWriter' type-id='type-id-924' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-996'/>
     <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1018'/>
     <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1019'/>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::__normal_iterator<MallocExtension::FreeListInfo*, std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > > -->
       <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1028'>
@@ -11702,36 +11702,14 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const MallocExtension::FreeListInfo& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1025'/>
-    <!-- const MallocExtension::FreeListInfo& -->
-    <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
-    <!-- const __gnu_cxx::new_allocator<char> -->
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-1030'/>
-    <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1020'/>
-    <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
-    <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1032'/>
-    <!-- const std::allocator<MallocExtension::FreeListInfo>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1024'/>
-    <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1033'/>
-    <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1026'/>
-    <!-- std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1022'/>
-    <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
-    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <namespace-decl name='std'>
       <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1023'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1044'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1039'>
             <!-- class std::allocator<MallocExtension::FreeListInfo> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- MallocExtension::FreeListInfo* std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-1034' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -11748,7 +11726,7 @@
               <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl*' -->
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -11757,7 +11735,7 @@
               <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_Vector_impl(const std::allocator<MallocExtension::FreeListInfo>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl*' -->
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
                 <parameter type-id='type-id-1024'/>
                 <!-- void -->
@@ -11768,13 +11746,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-1044' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1039' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11783,7 +11761,7 @@
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base(const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
             <parameter type-id='type-id-1024'/>
             <!-- void -->
@@ -11794,7 +11772,7 @@
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base(unsigned long int, const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
@@ -11807,7 +11785,7 @@
           <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -11816,6 +11794,28 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- const MallocExtension::FreeListInfo& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1025'/>
+    <!-- const MallocExtension::FreeListInfo& -->
+    <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
+    <!-- const __gnu_cxx::new_allocator<char> -->
+    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-1030'/>
+    <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-1020'/>
+    <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
+    <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1032'/>
+    <!-- const std::allocator<MallocExtension::FreeListInfo>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1024'/>
+    <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> -->
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1033'/>
+    <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1026'/>
+    <!-- std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1022'/>
+    <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
+    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <!-- MallocExtension::FreeListInfo* -->
     <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-1034'/>
     <!-- MallocExtension::FreeListInfo* const& -->
@@ -11826,7 +11826,7 @@
     <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1037'/>
     <namespace-decl name='std'>
       <!-- class std::allocator<MallocExtension::FreeListInfo> -->
-      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1045'>
+      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1040'>
         <!-- class __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
         <member-function access='private'>
@@ -11862,26 +11862,12 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const MallocExtension::FreeListInfo -->
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1039'/>
-    <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1040'/>
-    <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1038'/>
-    <!-- const std::allocator<MallocExtension::FreeListInfo> -->
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1041'/>
-    <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1043'/>
-    <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1047'/>
-    <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1046'/>
     <namespace-decl name='std'>
       <!-- struct std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> -->
-      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1042'>
+      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1046'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- HeapProfileTable::AllocValue::Bucket* const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::first -->
-          <var-decl name='first' type-id='type-id-1052' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1051' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- HeapProfileTable::Snapshot::Entry std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::second -->
@@ -11891,7 +11877,7 @@
           <!-- void std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>*' -->
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -11900,21 +11886,35 @@
           <!-- void std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::pair(HeapProfileTable::AllocValue::Bucket* const&, const HeapProfileTable::Snapshot::Entry&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>*' -->
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1053'/>
             <!-- parameter of type 'const HeapProfileTable::Snapshot::Entry&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1054'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- const MallocExtension::FreeListInfo -->
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1043'/>
+    <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1044'/>
+    <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1038'/>
+    <!-- const std::allocator<MallocExtension::FreeListInfo> -->
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1045'/>
+    <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1047'/>
+    <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1042'/>
+    <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl* -->
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const -->
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1052'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1051'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1054'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
     <!-- MallocExtension::FreeListInfo* const -->
     <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1048'/>
     <namespace-decl name='__gnu_cxx'>
@@ -11954,13 +11954,13 @@
       </class-decl>
     </namespace-decl>
     <!-- const HeapProfileTable::Snapshot::Entry& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1054'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1051'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1055'/>
     <!-- std::allocator<MallocExtension::FreeListInfo>* -->
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1050'/>
     <!-- std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>* -->
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1052'/>
     <!-- __gnu_cxx::new_allocator<MallocExtension::FreeListInfo>* -->
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1056'/>
     <!-- const HeapProfileTable::Snapshot::Entry -->
@@ -11978,13 +11978,13 @@
     <!-- HeapProfileTable::AllocValue* const -->
     <qualified-type-def type-id='type-id-228' const='yes' id='type-id-1060'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const -->
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1052'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1051'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const& -->
-    <qualified-type-def type-id='type-id-1054' id='type-id-1061'/>
+    <qualified-type-def type-id='type-id-1053' id='type-id-1061'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1054'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
     <!-- HeapProfileTable::AllocValue::Bucket* const* -->
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1062'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1062'/>
     <!-- HeapProfileTable::AllocValue::Bucket*& -->
     <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-1063'/>
     <!-- HeapProfileTable::Snapshot* const -->
@@ -11994,7 +11994,7 @@
     <!-- HeapProfileTable::Snapshot::Entry* -->
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-220'/>
     <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1019'/>
     <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
     <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1065'/>
     <!-- __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
@@ -12020,33 +12020,33 @@
     <!-- const HeapProfileTable::Snapshot::Entry -->
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-1058'/>
     <!-- const HeapProfileTable::Snapshot::Entry& -->
-    <qualified-type-def type-id='type-id-1055' id='type-id-1072'/>
+    <qualified-type-def type-id='type-id-1054' id='type-id-1072'/>
     <!-- const HeapProfileTable::Snapshot::Entry& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1054'/>
     <!-- const HeapProfileTable::Snapshot::Entry* -->
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1073'/>
     <!-- const HeapProfileTable::Snapshot::Entry* const -->
     <qualified-type-def type-id='type-id-1073' const='yes' id='type-id-1074'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1040'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1044'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1020'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-1020'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1075'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1075'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
     <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1051'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1055'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1038'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1038'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1077'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1077'/>
     <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1005'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1011'/>
     <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-974'/>
     <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1078'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1078'/>
     <!-- const std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
     <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1079'/>
     <!-- const std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
@@ -12062,19 +12062,19 @@
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
     <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <qualified-type-def type-id='type-id-1014' id='type-id-1085'/>
+    <qualified-type-def type-id='type-id-1003' id='type-id-1085'/>
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1014'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1003'/>
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
     <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1086'/>
     <!-- const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* const -->
     <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
     <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1032'/>
     <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1088'/>
     <!-- const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1002'/>
     <!-- const std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
     <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1090'/>
     <!-- const std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
@@ -12082,17 +12082,17 @@
     <!-- const std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* const -->
     <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1092'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1007'/>
+    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1013'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-972'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-972'/>
     <!-- const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-992'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-992'/>
     <!-- const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-933'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-937'/>
     <!-- const std::less<HeapProfileTable::Bucket*> -->
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
     <!-- const std::less<HeapProfileTable::Bucket*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-936'/>
     <!-- const std::less<HeapProfileTable::Bucket*>* -->
     <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1093'/>
     <!-- const std::less<HeapProfileTable::Bucket*>* const -->
@@ -12100,23 +12100,23 @@
     <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
     <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
     <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-938'/>
     <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
     <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-1095'/>
     <!-- const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
     <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1096'/>
     <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1033'/>
     <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
-    <qualified-type-def type-id='type-id-1009' id='type-id-977'/>
+    <qualified-type-def type-id='type-id-1015' id='type-id-977'/>
     <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1009'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1015'/>
     <!-- const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>* -->
     <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1097'/>
     <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-930' size-in-bits='64' id='type-id-1098'/>
+    <reference-type-def kind='lvalue' type-id='type-id-934' size-in-bits='64' id='type-id-1098'/>
     <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-973'/>
     <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
     <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
     <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false>* -->
@@ -12128,37 +12128,37 @@
     <!-- std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-1102'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1012'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1001'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* const -->
-    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1103'/>
     <!-- std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-978' size-in-bits='64' id='type-id-1104'/>
     <!-- std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1004'/>
     <!-- std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* const -->
-    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1105'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1105'/>
     <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1106'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1106'/>
     <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-976'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-969' size-in-bits='64' id='type-id-1107'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1002'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1006'/>
     <!-- std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1022'/>
     <!-- std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-222' size-in-bits='64' id='type-id-1108'/>
     <!-- std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* -->
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-935'/>
     <!-- std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >* const -->
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1109'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1109'/>
     <!-- std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-1110'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1110'/>
     <!-- std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>* -->
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1052'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1008'/>
     <!-- void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)* -->
     <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-199'/>
     <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)* -->
@@ -12209,12 +12209,12 @@
       <!-- class std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
         <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1001'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
         <member-function access='private'>
           <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12223,7 +12223,7 @@
           <!-- void std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::allocator(const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
             <parameter type-id='type-id-972'/>
             <!-- void -->
@@ -12234,7 +12234,7 @@
           <!-- std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12245,12 +12245,12 @@
       <!-- struct std::less<HeapProfileTable::Bucket*> -->
       <class-decl name='less&lt;HeapProfileTable::Bucket*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-970'>
         <!-- struct std::binary_function<HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1007'/>
       </class-decl>
       <!-- struct std::binary_function<HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool> -->
-      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1016'/>
+      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1007'/>
       <!-- class std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-930'>
+      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-934'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false> -->
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-968'>
@@ -12283,7 +12283,7 @@
                 <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_Rb_tree_impl<std::less<HeapProfileTable::Bucket*>, false>*' -->
                 <parameter type-id='type-id-971' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-                <parameter type-id='type-id-932'/>
+                <parameter type-id='type-id-936'/>
                 <!-- parameter of type 'const std::allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
                 <parameter type-id='type-id-972'/>
                 <!-- void -->
@@ -12311,9 +12311,9 @@
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-973' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-            <parameter type-id='type-id-932'/>
+            <parameter type-id='type-id-936'/>
             <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12392,7 +12392,7 @@
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1008'>
+      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1014'>
         <!-- class __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1021'/>
         <member-function access='private'>
@@ -12410,7 +12410,7 @@
             <!-- implicit parameter of type 'std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
             <parameter type-id='type-id-1022' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12450,7 +12450,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12459,7 +12459,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
             <parameter type-id='type-id-976'/>
             <!-- void -->
@@ -12468,10 +12468,10 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> -->
-      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1042'>
+      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1046'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- HeapProfileTable::AllocValue::Bucket* const std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::first -->
-          <var-decl name='first' type-id='type-id-1052' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1051' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- HeapProfileTable::Snapshot::Entry std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::second -->
@@ -12481,7 +12481,7 @@
           <!-- void std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>*' -->
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12490,11 +12490,11 @@
           <!-- void std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>::pair(HeapProfileTable::AllocValue::Bucket* const&, const HeapProfileTable::Snapshot::Entry&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>*' -->
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
-            <parameter type-id='type-id-1054'/>
+            <parameter type-id='type-id-1053'/>
             <!-- parameter of type 'const HeapProfileTable::Snapshot::Entry&' -->
-            <parameter type-id='type-id-1055'/>
+            <parameter type-id='type-id-1054'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12511,17 +12511,17 @@
       <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
         <member-type access='private'>
           <!-- class std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::value_compare -->
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-929'/>
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-933'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-934' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12530,11 +12530,11 @@
           <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::less<HeapProfileTable::Bucket*>&, const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<HeapProfileTable::Bucket*>&' -->
-            <parameter type-id='type-id-932'/>
+            <parameter type-id='type-id-936'/>
             <!-- parameter of type 'const std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12543,9 +12543,9 @@
           <!-- void std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::map(const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
-            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >&' -->
-            <parameter type-id='type-id-934'/>
+            <parameter type-id='type-id-938'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12594,7 +12594,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12603,9 +12603,9 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>*' -->
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1003'/>
             <!-- parameter of type 'const bool&' -->
             <parameter type-id='type-id-488'/>
             <!-- void -->
@@ -12623,7 +12623,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12632,9 +12632,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12643,9 +12643,9 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >*' -->
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >&' -->
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1003'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -12788,15 +12788,15 @@
       <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
-        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1053'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
-        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1053'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
-        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1053'/>
         <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
         <parameter type-id='type-id-1068'/>
         <!-- HeapProfileTable::AllocValue::Bucket* const& -->
-        <return type-id='type-id-1054'/>
+        <return type-id='type-id-1053'/>
       </function-decl>
       <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12867,13 +12867,13 @@
       <!-- const HeapProfileTable::Snapshot::Entry& std::__median<HeapProfileTable::Snapshot::Entry>(const HeapProfileTable::Snapshot::Entry&, const HeapProfileTable::Snapshot::Entry&, const HeapProfileTable::Snapshot::Entry&) -->
       <function-decl name='__median&lt;HeapProfileTable::Snapshot::Entry&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const HeapProfileTable::Snapshot::Entry&' -->
-        <parameter type-id='type-id-1055'/>
+        <parameter type-id='type-id-1054'/>
         <!-- parameter of type 'const HeapProfileTable::Snapshot::Entry&' -->
-        <parameter type-id='type-id-1055'/>
+        <parameter type-id='type-id-1054'/>
         <!-- parameter of type 'const HeapProfileTable::Snapshot::Entry&' -->
-        <parameter type-id='type-id-1055'/>
+        <parameter type-id='type-id-1054'/>
         <!-- const HeapProfileTable::Snapshot::Entry& -->
-        <return type-id='type-id-1055'/>
+        <return type-id='type-id-1054'/>
       </function-decl>
       <!-- HeapProfileTable::Snapshot::Entry* std::__unguarded_partition<HeapProfileTable::Snapshot::Entry*, HeapProfileTable::Snapshot::Entry>(HeapProfileTable::Snapshot::Entry*, HeapProfileTable::Snapshot::Entry*, HeapProfileTable::Snapshot::Entry) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Snapshot::Entry*, HeapProfileTable::Snapshot::Entry&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2204' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13084,7 +13084,7 @@
         <return type-id='type-id-60'/>
       </function-decl>
       <!-- struct std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > -->
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1010'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1016'/>
       <!-- class std::reverse_iterator<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
       <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1121'/>
       <!-- class std::reverse_iterator<std::_Rb_tree_const_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
@@ -13182,7 +13182,7 @@
     <!-- namespace __gnu_cxx -->
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1001'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1005'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13437,17 +13437,17 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1130'/>
-    <!-- const std::less<const void*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1129'/>
     <namespace-decl name='std'>
       <!-- struct std::less<const void*> -->
       <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1128'>
         <!-- struct std::binary_function<const void*, const void*, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1135'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1133'/>
       </class-decl>
     </namespace-decl>
+    <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1130'/>
+    <!-- const std::less<const void*>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1129'/>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1131'>
@@ -13484,16 +13484,16 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::binary_function<const void*, const void*, bool> -->
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1133'/>
+    </namespace-decl>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1133'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1134'/>
     <!-- const std::less<const void*> -->
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1134'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1135'/>
     <!-- std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >* -->
     <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1132'/>
-    <namespace-decl name='std'>
-      <!-- struct std::binary_function<const void*, const void*, bool> -->
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1135'/>
-    </namespace-decl>
     <!-- __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >* -->
     <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-1136'/>
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
@@ -14528,79 +14528,6 @@
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1180'/>
     <!-- base::internal::HookList<void (*)(const void*, size_t)>* -->
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1187'/>
-    <!-- const volatile base::subtle::Atomic64* -->
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1225'/>
-    <!-- int (void*, size_t, int*) -->
-    <function-type size-in-bits='64' id='type-id-1210'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'int*' -->
-      <parameter type-id='type-id-963'/>
-      <!-- int -->
-      <return type-id='type-id-1'/>
-    </function-type>
-    <!-- int (void*, size_t, int, int, int, off_t, void**) -->
-    <function-type size-in-bits='64' id='type-id-1212'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'typedef off_t' -->
-      <parameter type-id='type-id-207'/>
-      <!-- parameter of type 'void**' -->
-      <parameter type-id='type-id-151'/>
-      <!-- int -->
-      <return type-id='type-id-1'/>
-    </function-type>
-    <!-- void (ptrdiff_t) -->
-    <function-type size-in-bits='64' id='type-id-1214'>
-      <!-- parameter of type 'typedef ptrdiff_t' -->
-      <parameter type-id='type-id-208'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, size_t, int, int, int, off_t) -->
-    <function-type size-in-bits='64' id='type-id-1216'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'typedef off_t' -->
-      <parameter type-id='type-id-207'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
-    <!-- void (void*, void*, size_t, size_t, int, void*) -->
-    <function-type size-in-bits='64' id='type-id-1218'>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'typedef size_t' -->
-      <parameter type-id='type-id-62'/>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-1'/>
-      <!-- parameter of type 'void*' -->
-      <parameter type-id='type-id-58'/>
-      <!-- void -->
-      <return type-id='type-id-60'/>
-    </function-type>
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
         <!-- struct base::internal::HookList<void (*)(const void*)> -->
@@ -14632,7 +14559,7 @@
             <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- void (void*, typedef size_t)* -->
               <return type-id='type-id-337'/>
             </function-decl>
@@ -14641,7 +14568,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-61'/>
             </function-decl>
@@ -14659,9 +14586,9 @@
             <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (void*, typedef size_t)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t)**' -->
-              <parameter type-id='type-id-1229' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
+              <parameter type-id='type-id-1228' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1' name='n' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <!-- int -->
@@ -14704,6 +14631,79 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <!-- const volatile base::subtle::Atomic64* -->
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1225'/>
+    <!-- int (void*, size_t, int*) -->
+    <function-type size-in-bits='64' id='type-id-1210'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'int*' -->
+      <parameter type-id='type-id-963'/>
+      <!-- int -->
+      <return type-id='type-id-1'/>
+    </function-type>
+    <!-- int (void*, size_t, int, int, int, off_t, void**) -->
+    <function-type size-in-bits='64' id='type-id-1212'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'typedef off_t' -->
+      <parameter type-id='type-id-207'/>
+      <!-- parameter of type 'void**' -->
+      <parameter type-id='type-id-151'/>
+      <!-- int -->
+      <return type-id='type-id-1'/>
+    </function-type>
+    <!-- void (ptrdiff_t) -->
+    <function-type size-in-bits='64' id='type-id-1214'>
+      <!-- parameter of type 'typedef ptrdiff_t' -->
+      <parameter type-id='type-id-208'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, size_t, int, int, int, off_t) -->
+    <function-type size-in-bits='64' id='type-id-1216'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'typedef off_t' -->
+      <parameter type-id='type-id-207'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
+    <!-- void (void*, void*, size_t, size_t, int, void*) -->
+    <function-type size-in-bits='64' id='type-id-1218'>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'typedef size_t' -->
+      <parameter type-id='type-id-62'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-1'/>
+      <!-- parameter of type 'void*' -->
+      <parameter type-id='type-id-58'/>
+      <!-- void -->
+      <return type-id='type-id-60'/>
+    </function-type>
     <!-- typedef long int __off64_t -->
     <typedef-decl name='__off64_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-1226'/>
     <namespace-decl name='base'>
@@ -14715,11 +14715,11 @@
     <!-- volatile base::subtle::Atomic64 -->
     <qualified-type-def type-id='type-id-1224' volatile='yes' id='type-id-1220'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)>* const -->
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1227'/>
     <!-- const volatile base::subtle::Atomic64 -->
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1227'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1229'/>
     <!-- void (void*, typedef size_t)** -->
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1228'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)>* -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1230'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)> -->
@@ -14949,7 +14949,7 @@
       </member-function>
     </class-decl>
     <!-- class STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1003'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1009'>
       <member-function access='private'>
         <!-- void STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>::STL_Allocator() -->
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14965,7 +14965,7 @@
           <!-- implicit parameter of type 'STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>*' -->
           <parameter type-id='type-id-1018' is-artificial='yes'/>
           <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-          <parameter type-id='type-id-938'/>
+          <parameter type-id='type-id-942'/>
           <!-- void -->
           <return type-id='type-id-60'/>
         </function-decl>
@@ -15004,7 +15004,7 @@
     <!-- MemoryRegionMap::RegionSetRep* -->
     <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-1241'/>
     <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1018'/>
     <!-- STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* const -->
     <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1242'/>
     <!-- STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
@@ -15018,23 +15018,23 @@
     <!-- const MemoryRegionMap::RegionCmp -->
     <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
     <!-- const MemoryRegionMap::RegionCmp& -->
-    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-937'/>
+    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-941'/>
     <!-- const MemoryRegionMap::RegionCmp* -->
     <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1245'/>
     <!-- const MemoryRegionMap::RegionCmp* const -->
     <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1246'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-991'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-991'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-938'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-942'/>
     <!-- const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>* -->
     <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-1247'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator> -->
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1004'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1010'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-984'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-984'/>
     <!-- const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>* -->
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1248'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1248'/>
     <!-- const SpinLock* const -->
     <qualified-type-def type-id='type-id-1249' const='yes' id='type-id-1250'/>
     <!-- const std::_Identity<MemoryRegionMap::Region> -->
@@ -15044,11 +15044,11 @@
     <!-- const std::_Identity<MemoryRegionMap::Region>* const -->
     <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1254'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1006'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1012'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-986'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1255'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1255'/>
     <!-- const std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
     <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1256'/>
     <!-- const std::_Rb_tree_iterator<MemoryRegionMap::Region>& -->
@@ -15062,7 +15062,7 @@
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
     <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-939'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-943'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
     <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-1261'/>
     <!-- const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
@@ -15072,9 +15072,9 @@
     <!-- const volatile Atomic32* -->
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-109'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1263'/>
+    <reference-type-def kind='lvalue' type-id='type-id-939' size-in-bits='64' id='type-id-1263'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-985'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
     <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
     <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>* -->
@@ -15098,9 +15098,9 @@
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-1272'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-936'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-940'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* const -->
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1273'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1273'/>
     <!-- void (const MemoryRegionMap::Region&)* -->
     <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-201'/>
     <!-- namespace std -->
@@ -15109,13 +15109,13 @@
       <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_M_t -->
-          <var-decl name='_M_t' type-id='type-id-935' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-939' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set() -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -15124,11 +15124,11 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const MemoryRegionMap::RegionCmp&, const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-937'/>
+            <parameter type-id='type-id-941'/>
             <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-942'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -15137,16 +15137,16 @@
           <!-- void std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::set(const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
-            <parameter type-id='type-id-936' is-artificial='yes'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
             <!-- parameter of type 'const std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >&' -->
-            <parameter type-id='type-id-939'/>
+            <parameter type-id='type-id-943'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> > -->
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-935'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-939'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true> -->
           <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-981'>
@@ -15179,7 +15179,7 @@
                 <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_Rb_tree_impl<MemoryRegionMap::RegionCmp, true>*' -->
                 <parameter type-id='type-id-983' is-artificial='yes'/>
                 <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-                <parameter type-id='type-id-937'/>
+                <parameter type-id='type-id-941'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<MemoryRegionMap::Region>, MemoryRegionMap::MyAllocator>&' -->
                 <parameter type-id='type-id-984'/>
                 <!-- void -->
@@ -15207,9 +15207,9 @@
             <!-- implicit parameter of type 'std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >*' -->
             <parameter type-id='type-id-985' is-artificial='yes'/>
             <!-- parameter of type 'const MemoryRegionMap::RegionCmp&' -->
-            <parameter type-id='type-id-937'/>
+            <parameter type-id='type-id-941'/>
             <!-- parameter of type 'const STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator>&' -->
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-942'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -16748,24 +16748,24 @@
     <qualified-type-def type-id='type-id-1404' const='yes' id='type-id-1395'/>
     <!-- const ProfileData::Options -->
     <qualified-type-def type-id='type-id-1397' const='yes' id='type-id-1396'/>
-    <!-- Entry[4] -->
-    <array-type-def dimensions='1' type-id='type-id-1404' size-in-bits='16896' id='type-id-1403'>
-      <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-5' id='type-id-162'/>
-    </array-type-def>
     <!-- ProfileData::Bucket* -->
     <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-1407'/>
     <!-- ProfileData::Entry::Slot* -->
     <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1408'/>
-    <!-- ProfileData::Options* -->
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
-    <!-- ProfileData::State* -->
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1411'/>
     <!-- Slot[64] -->
     <array-type-def dimensions='1' type-id='type-id-1405' size-in-bits='4096' id='type-id-1406'>
       <!-- <anonymous range>[64] -->
       <subrange length='64' type-id='type-id-5' id='type-id-1412'/>
     </array-type-def>
+    <!-- Entry[4] -->
+    <array-type-def dimensions='1' type-id='type-id-1404' size-in-bits='16896' id='type-id-1403'>
+      <!-- <anonymous range>[4] -->
+      <subrange length='4' type-id='type-id-5' id='type-id-162'/>
+    </array-type-def>
+    <!-- ProfileData::Options* -->
+    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
+    <!-- ProfileData::State* -->
+    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1411'/>
     <!-- char[1024] -->
     <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='8192' id='type-id-1401'>
       <!-- <anonymous range>[1024] -->
@@ -18109,19 +18109,19 @@
     <!-- const std::_Select1st<std::pair<const void* const, const char*> >* const -->
     <qualified-type-def type-id='type-id-1499' const='yes' id='type-id-1500'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > > -->
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1133'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1134'/>
     <!-- const std::allocator<std::_Rb_tree_node<std::pair<const void* const, const char*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1130'/>
     <!-- const std::allocator<std::pair<const void* const, const char*> > -->
     <qualified-type-def type-id='type-id-1501' const='yes' id='type-id-1502'/>
     <!-- const std::allocator<std::pair<const void* const, const char*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
     <!-- const std::less<const void*> -->
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1134'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1135'/>
     <!-- const std::less<const void*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1129'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1129'/>
     <!-- const std::less<const void*>* -->
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1504'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1504'/>
     <!-- const std::less<const void*>* const -->
     <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-1505'/>
     <!-- const std::map<const void*, const char*, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > > -->
@@ -18187,10 +18187,10 @@
       <!-- struct std::less<const void*> -->
       <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1128'>
         <!-- struct std::binary_function<const void*, const void*, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1135'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1133'/>
       </class-decl>
       <!-- struct std::binary_function<const void*, const void*, bool> -->
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1135'/>
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1133'/>
       <!-- struct std::_Rb_tree_iterator<std::pair<const void* const, const char*> > -->
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1487'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -20695,13 +20695,13 @@
     <!-- char** -->
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-125'/>
     <!-- const MallocExtension::FreeListInfo -->
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1039'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1043'/>
     <!-- const MallocExtension::FreeListInfo& -->
     <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
     <!-- const MallocExtension::FreeListInfo& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1025'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1025'/>
     <!-- const MallocExtension::FreeListInfo* -->
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1633'/>
     <!-- const PackedCache<35, long unsigned int> -->
     <qualified-type-def type-id='type-id-1595' const='yes' id='type-id-1634'/>
     <!-- const PackedCache<35, long unsigned int>* -->
@@ -20759,7 +20759,7 @@
     <!-- const base::internal::HookList<void (*)(const void*, size_t)>* -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1230'/>
     <!-- const base::internal::HookList<void (*)(const void*, size_t)>* const -->
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1227'/>
     <!-- const bool -->
     <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
     <!-- const char -->
@@ -20781,9 +20781,9 @@
     <!-- const mbstate_t* -->
     <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
     <!-- const ptrdiff_t -->
-    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-940'/>
+    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-944'/>
     <!-- const ptrdiff_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-940' size-in-bits='64' id='type-id-490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-944' size-in-bits='64' id='type-id-490'/>
     <!-- const size_t -->
     <qualified-type-def type-id='type-id-62' const='yes' id='type-id-117'/>
     <!-- const std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
@@ -20793,19 +20793,19 @@
     <!-- const std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
     <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1658'/>
     <!-- const std::allocator<MallocExtension::FreeListInfo> -->
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1045'/>
     <!-- const std::allocator<MallocExtension::FreeListInfo>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1024'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1024'/>
     <!-- const std::allocator<char> -->
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-941'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-945'/>
     <!-- const std::allocator<char>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-617'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-617'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-942'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-946'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-632'/>
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-632'/>
     <!-- const std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-634'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-634'/>
     <!-- const std::float_denorm_style -->
     <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1660'/>
     <!-- const std::float_round_style -->
@@ -20817,11 +20817,11 @@
     <!-- const std::nothrow_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-1664' size-in-bits='64' id='type-id-1665'/>
     <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1047'/>
     <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1026'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1026'/>
     <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1667'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1667'/>
     <!-- const std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
     <qualified-type-def type-id='type-id-1667' const='yes' id='type-id-1668'/>
     <!-- const tcmalloc::PageHeap -->
@@ -20867,9 +20867,9 @@
     <!-- const unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
     <!-- const volatile base::subtle::Atomic64 -->
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1227'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1229'/>
     <!-- const volatile base::subtle::Atomic64* -->
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1225'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1225'/>
     <!-- const wchar_t -->
     <qualified-type-def type-id='type-id-1582' const='yes' id='type-id-1691'/>
     <!-- const wchar_t* -->
@@ -20887,17 +20887,17 @@
     <!-- size_t* -->
     <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
     <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1047'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1042'/>
     <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
-    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1697'/>
+    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1697'/>
     <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1046'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
     <!-- std::allocator<MallocExtension::FreeListInfo>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1698'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1698'/>
     <!-- std::allocator<MallocExtension::FreeListInfo>* -->
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1050'/>
     <!-- std::allocator<char>* -->
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-989'/>
     <!-- std::bad_alloc* -->
     <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
@@ -20905,7 +20905,7 @@
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >* -->
     <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider* -->
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep& -->
     <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-1702'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
@@ -20913,9 +20913,9 @@
     <!-- std::exception* -->
     <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
     <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-1705'/>
     <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* -->
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-967'/>
     <!-- std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >* const -->
     <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <!-- tcmalloc::CentralFreeList* -->
@@ -20981,7 +20981,7 @@
     <!-- void (void*, typedef size_t)* -->
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-337'/>
     <!-- void (void*, typedef size_t)** -->
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1228'/>
     <!-- void (void*, void*)* -->
     <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
     <!-- void* -->
@@ -21013,7 +21013,7 @@
     <!-- namespace std -->
     <namespace-decl name='std'>
       <!-- class std::allocator<MallocExtension::FreeListInfo> -->
-      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1045'>
+      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1040'>
         <!-- class __gnu_cxx::new_allocator<MallocExtension::FreeListInfo> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
         <member-function access='private'>
@@ -21077,9 +21077,9 @@
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1023'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1044'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1039'>
             <!-- class std::allocator<MallocExtension::FreeListInfo> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- MallocExtension::FreeListInfo* std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-1034' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -21096,7 +21096,7 @@
               <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl*' -->
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -21105,7 +21105,7 @@
               <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl::_Vector_impl(const std::allocator<MallocExtension::FreeListInfo>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl*' -->
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
                 <parameter type-id='type-id-1024'/>
                 <!-- void -->
@@ -21116,13 +21116,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_impl std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-1044' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1039' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-60'/>
           </function-decl>
@@ -21131,7 +21131,7 @@
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base(const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
             <parameter type-id='type-id-1024'/>
             <!-- void -->
@@ -21142,7 +21142,7 @@
           <!-- void std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::_Vector_base(unsigned long int, const std::allocator<MallocExtension::FreeListInfo>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-5'/>
             <!-- parameter of type 'const std::allocator<MallocExtension::FreeListInfo>&' -->
@@ -21155,7 +21155,7 @@
           <!-- std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> >*' -->
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -21164,7 +21164,7 @@
         </member-function>
       </class-decl>
       <!-- class std::vector<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
-      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1011'>
+      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1017'>
         <!-- struct std::_Vector_base<MallocExtension::FreeListInfo, std::allocator<MallocExtension::FreeListInfo> > -->
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
@@ -21239,7 +21239,7 @@
         </member-function>
       </class-decl>
       <!-- class std::allocator<char> -->
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-945'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-931'>
         <!-- class __gnu_cxx::new_allocator<char> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
         <member-function access='private'>
@@ -21280,7 +21280,7 @@
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep -->
           <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-636'>
             <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
             <data-member access='public' static='yes'>
               <!-- static const size_t std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_S_max_size -->
               <var-decl name='_S_max_size' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='51' column='1'/>
@@ -21297,9 +21297,9 @@
         </member-type>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider -->
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-944'>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-930'>
             <!-- class std::allocator<char> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-931'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider::_M_p -->
               <var-decl name='_M_p' type-id='type-id-118' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='262' column='1'/>
@@ -21308,7 +21308,7 @@
               <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider::_Alloc_hider(char*, const std::allocator<char>&) -->
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider*' -->
-                <parameter type-id='type-id-946' is-artificial='yes'/>
+                <parameter type-id='type-id-932' is-artificial='yes'/>
                 <!-- parameter of type 'char*' -->
                 <parameter type-id='type-id-118'/>
                 <!-- parameter of type 'const std::allocator<char>&' -->
@@ -21321,7 +21321,7 @@
         </member-type>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base -->
-          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-943'>
+          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-929'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- size_t std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep_base::_M_length -->
               <var-decl name='_M_length' type-id='type-id-62' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='142' column='1'/>
@@ -21342,7 +21342,7 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Alloc_hider std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_dataplus -->
-          <var-decl name='_M_dataplus' type-id='type-id-944' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string() -->
@@ -22860,7 +22860,7 @@
             <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- void (void*, typedef size_t)* -->
               <return type-id='type-id-337'/>
             </function-decl>
@@ -22869,7 +22869,7 @@
             <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::empty() -->
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- bool -->
               <return type-id='type-id-61'/>
             </function-decl>
@@ -22887,9 +22887,9 @@
             <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (void*, typedef size_t)**, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>* const' -->
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <!-- parameter of type 'void (void*, typedef size_t)**' -->
-              <parameter type-id='type-id-1229' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
+              <parameter type-id='type-id-1228' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1' name='n' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <!-- int -->
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 25f3707c..bcf0186f 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -7135,16 +7135,124 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> -->
+      <class-decl name='_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-482'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_cur -->
+          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_first -->
+          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_last -->
+          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <!-- unsigned char** std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_node -->
+          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <!-- parameter of type 'unsigned char*' -->
+            <parameter type-id='type-id-89'/>
+            <!-- parameter of type 'unsigned char**' -->
+            <parameter type-id='type-id-468'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator() -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
+            <parameter type-id='type-id-508'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
+      <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-472'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_cur -->
+          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_first -->
+          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_last -->
+          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <!-- unsigned char** std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_node -->
+          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <!-- parameter of type 'unsigned char*' -->
+            <parameter type-id='type-id-89'/>
+            <!-- parameter of type 'unsigned char**' -->
+            <parameter type-id='type-id-468'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator() -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
+            <parameter type-id='type-id-508'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::deque<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='deque&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='639' column='1' id='type-id-57'>
         <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-507'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-510'/>
         <member-function access='private'>
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque() -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7153,7 +7261,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(const std::allocator<unsigned char>&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<unsigned char>&' -->
             <parameter type-id='type-id-251'/>
             <!-- void -->
@@ -7164,7 +7272,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(unsigned long int, const unsigned char&, const std::allocator<unsigned char>&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='710' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const unsigned char&' -->
@@ -7179,9 +7287,9 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(const std::deque<unsigned char, std::allocator<unsigned char> >&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'const std::deque<unsigned char, std::allocator<unsigned char> >&' -->
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-512'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7190,7 +7298,7 @@
           <!-- std::deque<unsigned char, std::allocator<unsigned char> >::~deque(int) -->
           <function-decl name='~deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -7201,7 +7309,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_dispatch<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::__false_type) -->
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -7209,7 +7317,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7218,7 +7326,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_dispatch<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::__false_type) -->
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -7226,7 +7334,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
             <parameter type-id='type-id-482'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7235,7 +7343,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::insert<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>) -->
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -7250,7 +7358,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::insert<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>) -->
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -7265,7 +7373,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_reallocate_map(size_t, bool) -->
           <function-decl name='_M_reallocate_map' mangled-name='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <!-- parameter of type 'bool' -->
@@ -7278,7 +7386,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_reserve_map_at_back(size_t) -->
           <function-decl name='_M_reserve_map_at_back' mangled-name='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1715' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -7289,7 +7397,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_new_elements_at_front(size_t) -->
           <function-decl name='_M_new_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -7300,7 +7408,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_new_elements_at_back(size_t) -->
           <function-decl name='_M_new_elements_at_back' mangled-name='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -7311,7 +7419,7 @@
           <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> std::deque<unsigned char, std::allocator<unsigned char> >::_M_reserve_elements_at_front(size_t) -->
           <function-decl name='_M_reserve_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1'/>
             <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
@@ -7322,7 +7430,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, size_t) -->
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -7339,7 +7447,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_range_insert_aux<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::forward_iterator_tag) -->
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -7347,7 +7455,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <!-- parameter of type 'struct std::forward_iterator_tag' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7356,7 +7464,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, size_t, const unsigned char&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
@@ -7371,7 +7479,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, size_t) -->
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -7388,7 +7496,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_range_insert_aux<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::forward_iterator_tag) -->
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -7396,7 +7504,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <!-- parameter of type 'struct std::forward_iterator_tag' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -7405,15 +7513,17 @@
           <!-- std::deque<unsigned char, std::allocator<unsigned char> >& std::deque<unsigned char, std::allocator<unsigned char> >::operator=(const std::deque<unsigned char, std::allocator<unsigned char> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt5dequeIhSaIhEEaSERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEEaSERKS1_'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'const std::deque<unsigned char, std::allocator<unsigned char> >&' -->
-            <parameter type-id='type-id-513' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
+            <parameter type-id='type-id-516' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
             <!-- std::deque<unsigned char, std::allocator<unsigned char> >& -->
-            <return type-id='type-id-514'/>
+            <return type-id='type-id-517'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <!-- struct vtkAbstractArray -->
+    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-402'/>
     <!-- class vtkCharArray -->
     <class-decl name='vtkCharArray' visibility='default' is-declaration-only='yes' id='type-id-406'/>
     <!-- class vtkDataArray -->
@@ -7424,12 +7534,16 @@
     <class-decl name='vtkDataSet' visibility='default' is-declaration-only='yes' id='type-id-413'/>
     <!-- class vtkDataWriter -->
     <class-decl name='vtkDataWriter' visibility='default' is-declaration-only='yes' id='type-id-415'/>
+    <!-- struct vtkGarbageCollector -->
+    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-418'/>
     <!-- class vtkGenericDataObjectReader -->
     <class-decl name='vtkGenericDataObjectReader' visibility='default' is-declaration-only='yes' id='type-id-420'/>
     <!-- class vtkGenericDataObjectWriter -->
     <class-decl name='vtkGenericDataObjectWriter' visibility='default' is-declaration-only='yes' id='type-id-422'/>
     <!-- class vtkImageData -->
     <class-decl name='vtkImageData' visibility='default' is-declaration-only='yes' id='type-id-424'/>
+    <!-- struct vtkMultiBlockDataSet -->
+    <class-decl name='vtkMultiBlockDataSet' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <!-- class vtkObject -->
     <class-decl name='vtkObject' visibility='default' is-declaration-only='yes' id='type-id-119'/>
     <!-- class vtkRectilinearGrid -->
@@ -7439,15 +7553,15 @@
     <!-- const int& -->
     <reference-type-def kind='lvalue' type-id='type-id-211' size-in-bits='64' id='type-id-474'/>
     <!-- const std::_Bit_type* -->
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-479'/>
     <!-- const std::string& -->
     <qualified-type-def type-id='type-id-276' id='type-id-82'/>
     <!-- const std::vector<unsigned char, std::allocator<unsigned char> >& -->
     <qualified-type-def type-id='type-id-284' id='type-id-87'/>
     <!-- const unsigned char* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-498'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* -->
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-459'/>
     <!-- const vtkMultiProcessStream* const -->
     <qualified-type-def type-id='type-id-307' const='yes' id='type-id-64'/>
     <!-- double*& -->
@@ -7490,120 +7604,6 @@
     <qualified-type-def type-id='type-id-385' id='type-id-71'/>
     <!-- std::vector<unsigned char, std::allocator<unsigned char> >& -->
     <qualified-type-def type-id='type-id-389' id='type-id-65'/>
-    <namespace-decl name='std'>
-      <!-- struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> -->
-      <class-decl name='_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-482'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_cur -->
-          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_first -->
-          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_last -->
-          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <!-- unsigned char** std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_M_node -->
-          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <!-- parameter of type 'unsigned char*' -->
-            <parameter type-id='type-id-89'/>
-            <!-- parameter of type 'unsigned char**' -->
-            <parameter type-id='type-id-468'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator() -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-            <parameter type-id='type-id-519'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
-      <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-472'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_cur -->
-          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_first -->
-          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <!-- unsigned char* std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_last -->
-          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <!-- unsigned char** std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_M_node -->
-          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <!-- parameter of type 'unsigned char*' -->
-            <parameter type-id='type-id-89'/>
-            <!-- parameter of type 'unsigned char**' -->
-            <parameter type-id='type-id-468'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator() -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-            <parameter type-id='type-id-519'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <!-- struct vtkAbstractArray -->
-    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-402'/>
-    <!-- struct vtkGarbageCollector -->
-    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-418'/>
-    <!-- struct vtkMultiBlockDataSet -->
-    <class-decl name='vtkMultiBlockDataSet' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <!-- unsigned char& -->
     <qualified-type-def type-id='type-id-393' id='type-id-70'/>
     <!-- unsigned char* const* -->
@@ -7654,7 +7654,7 @@
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-505'/>
     <namespace-decl name='std'>
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
-      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-507'>
+      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-510'>
         <member-type access='protected'>
           <!-- enum std::_Deque_base<unsigned char, std::allocator<unsigned char> >::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-528'>
@@ -7766,9 +7766,20 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
+    <namespace-decl name='std'>
+      <!-- struct std::__false_type -->
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-513'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::forward_iterator_tag -->
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-515'>
+        <!-- struct std::input_iterator_tag -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      </class-decl>
+    </namespace-decl>
+    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-534'>
       <member-type access='private'>
-        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-534'>
+        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-535'>
           <member-type access='private'>
             <!-- class vtkMultiProcessController::vtkInternal::vtkRMICallback -->
             <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-521'>
@@ -7778,7 +7789,7 @@
               </data-member>
               <data-member access='private' layout-offset-in-bits='64'>
                 <!-- vtkRMIFunctionType vtkMultiProcessController::vtkInternal::vtkRMICallback::Function -->
-                <var-decl name='Function' type-id='type-id-535' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
+                <var-decl name='Function' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <!-- void* vtkMultiProcessController::vtkInternal::vtkRMICallback::LocalArgument -->
@@ -7790,42 +7801,31 @@
       </member-type>
     </class-decl>
     <!-- const char* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-504'/>
     <!-- const std::_Bit_type -->
-    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-515'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-518'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-519'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-508'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-512'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <qualified-type-def type-id='type-id-509' id='type-id-513'/>
+    <qualified-type-def type-id='type-id-512' id='type-id-516'/>
     <!-- const unsigned char* const -->
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-519'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback -->
-    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-520'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-506'/>
     <!-- std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>* -->
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-507'/>
     <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>* -->
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-509'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-514'/>
+    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-517'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >* -->
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-511'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >* const -->
-    <qualified-type-def type-id='type-id-508' const='yes' id='type-id-511'/>
-    <namespace-decl name='std'>
-      <!-- struct std::__false_type -->
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-510'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- struct std::forward_iterator_tag -->
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-512'>
-        <!-- struct std::input_iterator_tag -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-540'/>
-      </class-decl>
-    </namespace-decl>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-514'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
     <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-523'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const -->
@@ -7838,23 +7838,9 @@
     <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-527'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const -->
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-526'/>
-    <!-- const char* const -->
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-536'/>
-    <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
-    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-537'/>
-    <!-- const std::deque<unsigned char, std::allocator<unsigned char> > -->
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-538'/>
-    <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* const -->
-    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-539'/>
-    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* -->
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-531'/>
-    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* const -->
-    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
-    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >::_Deque_impl* -->
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
     <namespace-decl name='std'>
       <!-- struct std::input_iterator_tag -->
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-540'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-533'/>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <!-- struct vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
@@ -7868,8 +7854,22 @@
       <!-- struct vtksys::_Hashtable_node<std::pair<const int, void*> > -->
       <class-decl name='_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-543'/>
     </namespace-decl>
+    <!-- const char* const -->
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-537'/>
+    <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
+    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-538'/>
+    <!-- const std::deque<unsigned char, std::allocator<unsigned char> > -->
+    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-539'/>
+    <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* const -->
+    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-540'/>
+    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* -->
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-531'/>
+    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* const -->
+    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
+    <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >::_Deque_impl* -->
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
     <!-- typedef void (void*, void*, int, int)* vtkRMIFunctionType -->
-    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-535'/>
+    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-536'/>
     <!-- void (void*, void*, int, int)* -->
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-544'/>
   </abi-instr>
@@ -8008,7 +8008,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- struct vtkMultiProcessController -->
-    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
+    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-534'>
       <!-- class vtkObject -->
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-type access='public'>
@@ -8040,7 +8040,7 @@
       </member-type>
       <member-type access='private'>
         <!-- class vtkMultiProcessController::vtkInternal -->
-        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-534'>
+        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-535'>
           <member-type access='private'>
             <!-- class vtkMultiProcessController::vtkInternal::vtkRMICallback -->
             <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-521'>
@@ -8050,7 +8050,7 @@
               </data-member>
               <data-member access='private' layout-offset-in-bits='64'>
                 <!-- vtkRMIFunctionType vtkMultiProcessController::vtkInternal::vtkRMICallback::Function -->
-                <var-decl name='Function' type-id='type-id-535' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
+                <var-decl name='Function' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <!-- void* vtkMultiProcessController::vtkInternal::vtkRMICallback::LocalArgument -->
@@ -8469,7 +8469,7 @@
           <!-- implicit parameter of type 'vtkMultiProcessController*' -->
           <parameter type-id='type-id-561' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkRMIFunctionType' -->
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'int' -->
@@ -8506,7 +8506,7 @@
           <!-- implicit parameter of type 'vtkMultiProcessController*' -->
           <parameter type-id='type-id-561' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkRMIFunctionType' -->
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'int' -->
@@ -8521,7 +8521,7 @@
           <!-- implicit parameter of type 'vtkMultiProcessController*' -->
           <parameter type-id='type-id-561' is-artificial='yes'/>
           <!-- parameter of type 'typedef vtkRMIFunctionType' -->
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <!-- parameter of type 'void*' -->
           <parameter type-id='type-id-14'/>
           <!-- parameter of type 'int' -->
@@ -8611,11 +8611,11 @@
       </member-function>
     </class-decl>
     <!-- typedef void (void*, void*, int, int)* vtkRMIFunctionType -->
-    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-535'/>
+    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-536'/>
     <!-- class vtkDummyController -->
     <class-decl name='vtkDummyController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.h' line='30' column='1' id='type-id-570'>
       <!-- struct vtkMultiProcessController -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
       <member-function access='protected' constructor='yes'>
         <!-- vtkDummyController::vtkDummyController() -->
         <function-decl name='vtkDummyController' mangled-name='_ZN18vtkDummyControllerC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18vtkDummyControllerC2Ev'>
@@ -8827,7 +8827,7 @@
     <!-- vtkDummyController* const -->
     <qualified-type-def type-id='type-id-571' const='yes' id='type-id-575'/>
     <!-- vtkMultiProcessController* -->
-    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-561'/>
+    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-561'/>
     <namespace-decl name='vtksys'>
       <!-- class vtksys::hash_map<int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> > -->
       <class-decl name='hash_map&lt;int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-555'>
@@ -9029,7 +9029,7 @@
     <!-- vtkMultiProcessController* const -->
     <qualified-type-def type-id='type-id-561' const='yes' id='type-id-563'/>
     <!-- vtkMultiProcessController::vtkInternal* -->
-    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-560'/>
     <!-- vtkOutputWindow* -->
     <pointer-type-def type-id='type-id-590' size-in-bits='64' id='type-id-559'/>
     <!-- vtkProcess* -->
@@ -9633,7 +9633,7 @@
     <!-- const std::equal_to<int>& -->
     <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-579'/>
     <!-- const vtkMultiProcessController -->
-    <qualified-type-def type-id='type-id-533' const='yes' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-587'/>
     <!-- const vtksys::hash<int>& -->
     <reference-type-def kind='lvalue' type-id='type-id-624' size-in-bits='64' id='type-id-578'/>
     <!-- void (vtkMultiProcessController*, void*)* -->
@@ -9795,16 +9795,23 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- struct std::equal_to<int> -->
+      <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
+        <!-- struct std::binary_function<int, int, bool> -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-604'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9813,9 +9820,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9824,13 +9831,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&' -->
             <parameter type-id='type-id-477'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9839,9 +9846,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >&' -->
-            <parameter type-id='type-id-638'/>
+            <parameter type-id='type-id-639'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9850,7 +9857,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -9861,7 +9868,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**' -->
@@ -9876,7 +9883,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const' -->
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -9887,13 +9894,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const' -->
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >' -->
-            <parameter type-id='type-id-640' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-641' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&' -->
-            <parameter type-id='type-id-641' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-642' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9904,12 +9911,12 @@
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-610'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-642'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9918,9 +9925,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9929,13 +9936,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&' -->
             <parameter type-id='type-id-475'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9944,9 +9951,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >&' -->
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -9955,7 +9962,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -9966,7 +9973,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**' -->
@@ -9981,7 +9988,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const' -->
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -9992,13 +9999,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const' -->
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >' -->
-            <parameter type-id='type-id-647' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-648' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&' -->
-            <parameter type-id='type-id-648' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-649' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10009,12 +10016,12 @@
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-616'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-649'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-650'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10023,9 +10030,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10034,13 +10041,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void*> >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >* const&' -->
             <parameter type-id='type-id-476'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10049,9 +10056,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >&' -->
-            <parameter type-id='type-id-652'/>
+            <parameter type-id='type-id-653'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10060,7 +10067,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10071,7 +10078,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, void*> >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void*> >**, vtksys::_Hashtable_node<std::pair<const int, void*> >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >**' -->
@@ -10086,7 +10093,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const' -->
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -10097,56 +10104,19 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, void*> >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const' -->
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >' -->
-            <parameter type-id='type-id-654' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-655' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >* const&' -->
-            <parameter type-id='type-id-655' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-656' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-620'/>
-    <!-- const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-621'/>
-    <!-- const std::allocator<std::pair<const int, void*> > -->
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-622'/>
-    <!-- const std::equal_to<int> -->
-    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
-    <!-- const vtkProcess& -->
-    <reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-594'/>
-    <!-- const vtkProcess* -->
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-596'/>
-    <!-- const vtkProcessGroup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-597'/>
-    <!-- const vtkProcessGroup* -->
-    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-599'/>
-    <!-- const vtksys::hash<int> -->
-    <qualified-type-def type-id='type-id-601' const='yes' id='type-id-624'/>
-    <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-606'/>
-    <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-662' size-in-bits='64' id='type-id-612'/>
-    <!-- const vtksys::hash_select1st<const int, void*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-618'/>
-    <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-607'/>
-    <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-613'/>
-    <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-619'/>
-    <namespace-decl name='std'>
-      <!-- struct std::equal_to<int> -->
-      <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
-        <!-- struct std::binary_function<int, int, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
-      </class-decl>
-    </namespace-decl>
     <namespace-decl name='vtksys'>
       <!-- struct vtksys::hash<int> -->
       <class-decl name='hash&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_fun.hxx' line='106' column='1' id='type-id-601'/>
@@ -10155,23 +10125,53 @@
       <!-- struct vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > -->
       <class-decl name='hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-603'>
         <!-- struct std::unary_function<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-668'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-657'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <!-- struct vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)> -->
       <class-decl name='hash_select1st&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-609'>
         <!-- struct std::unary_function<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-669'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-658'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <!-- struct vtksys::hash_select1st<const int, void*> -->
       <class-decl name='hash_select1st&lt;const int, void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-615'>
         <!-- struct std::unary_function<std::pair<const int, void*>, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-670'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-659'/>
       </class-decl>
     </namespace-decl>
+    <!-- const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-620'/>
+    <!-- const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-621'/>
+    <!-- const std::allocator<std::pair<const int, void*> > -->
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-622'/>
+    <!-- const std::equal_to<int> -->
+    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
+    <!-- const vtkProcess& -->
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-594'/>
+    <!-- const vtkProcess* -->
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-596'/>
+    <!-- const vtkProcessGroup& -->
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-597'/>
+    <!-- const vtkProcessGroup* -->
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-599'/>
+    <!-- const vtksys::hash<int> -->
+    <qualified-type-def type-id='type-id-601' const='yes' id='type-id-624'/>
+    <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-606'/>
+    <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-612'/>
+    <!-- const vtksys::hash_select1st<const int, void*>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-618'/>
+    <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-607'/>
+    <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-613'/>
+    <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-619'/>
     <!-- vtkProcess* const -->
     <qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
     <!-- vtkProcessGroup* const -->
@@ -10184,7 +10184,7 @@
     <pointer-type-def type-id='type-id-584' size-in-bits='64' id='type-id-617'/>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-640'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-641'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -10213,7 +10213,7 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-647'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-648'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -10242,7 +10242,7 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-654'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-655'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -10307,144 +10307,32 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > > -->
-      <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-629'>
-        <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::new_allocator() -->
-          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
-            <parameter type-id='type-id-679' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::new_allocator(const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >&) -->
-          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
-            <parameter type-id='type-id-679' is-artificial='yes'/>
-            <!-- parameter of type 'const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >&' -->
-            <parameter type-id='type-id-680'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::~new_allocator(int) -->
-          <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
-            <parameter type-id='type-id-679' is-artificial='yes'/>
-            <!-- artificial parameter of type 'int' -->
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__gnu_cxx'>
-      <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > > -->
-      <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-632'>
-        <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::new_allocator() -->
-          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
-            <parameter type-id='type-id-681' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::new_allocator(const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >&) -->
-          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
-            <parameter type-id='type-id-681' is-artificial='yes'/>
-            <!-- parameter of type 'const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >&' -->
-            <parameter type-id='type-id-682'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::~new_allocator(int) -->
-          <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
-            <parameter type-id='type-id-681' is-artificial='yes'/>
-            <!-- artificial parameter of type 'int' -->
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- class std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-656'>
-        <!-- class __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-683'/>
-        <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator() -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator(const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&) -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <!-- parameter of type 'const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&' -->
-            <parameter type-id='type-id-580'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <!-- std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::~allocator(int) -->
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <!-- artificial parameter of type 'int' -->
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <!-- void -->
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- class std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-657'>
-        <!-- class __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-685'/>
-        <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator() -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+      <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-629'>
+        <member-function access='private'>
+          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::new_allocator() -->
+          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
+            <parameter type-id='type-id-679' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator(const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&) -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
-            <!-- parameter of type 'const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&' -->
-            <parameter type-id='type-id-583'/>
+          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::new_allocator(const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >&) -->
+          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <!-- parameter of type 'const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >&' -->
+            <parameter type-id='type-id-680'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
-          <!-- std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::~allocator(int) -->
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+          <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >::~new_allocator(int) -->
+          <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >*' -->
+            <parameter type-id='type-id-679' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10453,36 +10341,34 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <!-- class std::allocator<std::pair<const int, void*> > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-658'>
-        <!-- class __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
+    <namespace-decl name='__gnu_cxx'>
+      <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > > -->
+      <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-632'>
         <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, void*> >::allocator() -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::new_allocator() -->
+          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::allocator<std::pair<const int, void*> >::allocator(const std::allocator<std::pair<const int, void*> >&) -->
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
-            <!-- parameter of type 'const std::allocator<std::pair<const int, void*> >&' -->
-            <parameter type-id='type-id-586'/>
+          <!-- void __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::new_allocator(const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >&) -->
+          <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
+            <parameter type-id='type-id-681' is-artificial='yes'/>
+            <!-- parameter of type 'const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >&' -->
+            <parameter type-id='type-id-682'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
-          <!-- std::allocator<std::pair<const int, void*> >::~allocator(int) -->
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+          <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >::~new_allocator(int) -->
+          <function-decl name='~new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type '__gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >*' -->
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10491,66 +10377,14 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-628'/>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-637'/>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-631'/>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-644'/>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-693' size-in-bits='64' id='type-id-634'/>
-    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-694' size-in-bits='64' id='type-id-651'/>
-    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-638'/>
-    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-645'/>
-    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-697' size-in-bits='64' id='type-id-652'/>
-    <!-- const vtkProcess -->
-    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
-    <!-- const vtkProcessGroup -->
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
-    <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > -->
-    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-661'/>
-    <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)> -->
-    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-662'/>
-    <!-- const vtksys::hash_select1st<const int, void*> -->
-    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-663'/>
-    <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-664'/>
-    <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-665'/>
-    <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-666'/>
-    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >* -->
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-627'/>
-    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >* -->
-    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
-    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >* -->
-    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-636'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-639'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
-    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-643'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-646'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
-    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-650'/>
-    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-653'/>
     <namespace-decl name='std'>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-635'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-636'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-698'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-683'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-684'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -10567,7 +10401,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10576,9 +10410,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-                <parameter type-id='type-id-637'/>
+                <parameter type-id='type-id-638'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10587,13 +10421,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-698' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-683' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10602,9 +10436,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10613,11 +10447,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10626,7 +10460,7 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10637,12 +10471,12 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-642'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-643'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-702'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-687'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-703'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-688'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -10659,7 +10493,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10668,9 +10502,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-                <parameter type-id='type-id-644'/>
+                <parameter type-id='type-id-645'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10679,13 +10513,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-702' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-687' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10694,9 +10528,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10705,11 +10539,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10718,7 +10552,7 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10729,12 +10563,12 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-649'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-650'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-706'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-691'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -10751,7 +10585,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10760,9 +10594,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-                <parameter type-id='type-id-651'/>
+                <parameter type-id='type-id-652'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -10771,13 +10605,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-706' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10786,9 +10620,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10797,11 +10631,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10810,7 +10644,121 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
+            <!-- artificial parameter of type 'int' -->
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- class std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
+      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-660'>
+        <!-- class __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-695'/>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator() -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator(const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&) -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <!-- parameter of type 'const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&' -->
+            <parameter type-id='type-id-580'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <!-- std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::~allocator(int) -->
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <!-- artificial parameter of type 'int' -->
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- class std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
+      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-661'>
+        <!-- class __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-697'/>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator() -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator(const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&) -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <!-- parameter of type 'const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&' -->
+            <parameter type-id='type-id-583'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <!-- std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::~allocator(int) -->
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <!-- artificial parameter of type 'int' -->
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <!-- class std::allocator<std::pair<const int, void*> > -->
+      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-662'>
+        <!-- class __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, void*> >::allocator() -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <!-- void std::allocator<std::pair<const int, void*> >::allocator(const std::allocator<std::pair<const int, void*> >&) -->
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <!-- parameter of type 'const std::allocator<std::pair<const int, void*> >&' -->
+            <parameter type-id='type-id-586'/>
+            <!-- void -->
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <!-- std::allocator<std::pair<const int, void*> >::~allocator(int) -->
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -10821,32 +10769,84 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::binary_function<int, int, bool> -->
-      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-667'/>
+      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-635'/>
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::unary_function<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-668'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-657'/>
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::unary_function<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-669'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-658'/>
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- struct std::unary_function<std::pair<const int, void*>, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-670'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-659'/>
     </namespace-decl>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-701' size-in-bits='64' id='type-id-628'/>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-638'/>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-631'/>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-645'/>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-705' size-in-bits='64' id='type-id-634'/>
+    <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>& -->
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-652'/>
+    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-639'/>
+    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-646'/>
+    <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >& -->
+    <reference-type-def kind='lvalue' type-id='type-id-709' size-in-bits='64' id='type-id-653'/>
+    <!-- const vtkProcess -->
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-663'/>
+    <!-- const vtkProcessGroup -->
+    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-664'/>
+    <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > -->
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-665'/>
+    <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)> -->
+    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-666'/>
+    <!-- const vtksys::hash_select1st<const int, void*> -->
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-667'/>
+    <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> > -->
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-668'/>
+    <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> > -->
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-669'/>
+    <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> > -->
+    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-670'/>
+    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >* -->
+    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-627'/>
+    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >* -->
+    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
+    <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >* -->
+    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-637'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-640'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-644'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-647'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
+    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-651'/>
+    <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-654'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const& -->
-    <qualified-type-def type-id='type-id-477' id='type-id-641'/>
+    <qualified-type-def type-id='type-id-477' id='type-id-642'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const& -->
-    <qualified-type-def type-id='type-id-475' id='type-id-648'/>
+    <qualified-type-def type-id='type-id-475' id='type-id-649'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const& -->
-    <qualified-type-def type-id='type-id-476' id='type-id-655'/>
+    <qualified-type-def type-id='type-id-476' id='type-id-656'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >* -->
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-671'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-671'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >* -->
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-673'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-673'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >* -->
-    <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-675'/>
     <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >* -->
     <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-677'/>
     <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >* -->
@@ -10855,7 +10855,7 @@
     <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-681'/>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-683'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-695'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10891,7 +10891,7 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-685'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-697'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10927,7 +10927,7 @@
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-687'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-699'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, void*> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10963,7 +10963,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-699'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-684'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-716'/>
         <member-function access='private'>
@@ -10981,7 +10981,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>*' -->
             <parameter type-id='type-id-717' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -11012,7 +11012,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-703'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-688'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-718'/>
         <member-function access='private'>
@@ -11030,7 +11030,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>*' -->
             <parameter type-id='type-id-719' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -11061,7 +11061,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-707'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-692'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-720'/>
         <member-function access='private'>
@@ -11079,7 +11079,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>*' -->
             <parameter type-id='type-id-721' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -11115,41 +11115,41 @@
     <!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-724' size-in-bits='64' id='type-id-682'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > > -->
-    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-689'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-701'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-702'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > > -->
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-703'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-692'/>
+    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-704'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > > -->
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-693'/>
+    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-705'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-706'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-707'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-708'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-697'/>
+    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-709'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-686'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-685'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-705'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-690'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-704'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-689'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-650' size-in-bits='64' id='type-id-694'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-693'/>
     <!-- std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-684'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-696'/>
     <!-- std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* -->
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-686'/>
+    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-698'/>
     <!-- std::allocator<std::pair<const int, void*> >* -->
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-688'/>
+    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-700'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** const& -->
     <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-672'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** const& -->
@@ -11157,11 +11157,11 @@
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** const& -->
     <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-676'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-710'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* -->
-    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-712'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, void*> >* -->
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-714'/>
     <namespace-decl name='__gnu_cxx'>
       <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
       <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-716'>
@@ -11283,11 +11283,11 @@
     <!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > > -->
     <qualified-type-def type-id='type-id-632' const='yes' id='type-id-724'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>* -->
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-717'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>* -->
-    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-719'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>* -->
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-721'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** const -->
     <qualified-type-def type-id='type-id-466' const='yes' id='type-id-725'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** const -->
@@ -11301,11 +11301,11 @@
     <!-- __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>* -->
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-732'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-695' const='yes' id='type-id-734'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-    <qualified-type-def type-id='type-id-685' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-697' const='yes' id='type-id-735'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-736'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-736'/>
     <!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
     <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-729'/>
     <!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
@@ -12086,17 +12086,17 @@
     <!-- __gnu_cxx::__normal_iterator<vtkMultiProcessController::vtkInternal::vtkRMICallback*, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >* const -->
     <qualified-type-def type-id='type-id-769' const='yes' id='type-id-770'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-640' size-in-bits='64' id='type-id-771'/>
+    <reference-type-def kind='lvalue' type-id='type-id-641' size-in-bits='64' id='type-id-771'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >* -->
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-671'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-671'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-647' size-in-bits='64' id='type-id-772'/>
+    <reference-type-def kind='lvalue' type-id='type-id-648' size-in-bits='64' id='type-id-772'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >* -->
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-673'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-673'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-654' size-in-bits='64' id='type-id-773'/>
+    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-773'/>
     <!-- __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >* -->
-    <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-675'/>
     <!-- __gnu_cxx::new_allocator<bool>* -->
     <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-775'/>
     <!-- __gnu_cxx::new_allocator<int>* -->
@@ -12112,11 +12112,11 @@
     <!-- __gnu_cxx::new_allocator<std::_List_node<int> >* const -->
     <qualified-type-def type-id='type-id-783' const='yes' id='type-id-784'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-710'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* -->
-    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-712'/>
     <!-- __gnu_cxx::new_allocator<std::pair<const int, void*> >* -->
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-714'/>
     <!-- __gnu_cxx::new_allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback>* -->
     <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-786'/>
     <!-- __gnu_cxx::new_allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback>* const -->
@@ -12164,7 +12164,7 @@
     <!-- const __gnu_cxx::__normal_iterator<vtkMultiProcessController::vtkInternal::vtkRMICallback*, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >* const -->
     <qualified-type-def type-id='type-id-801' const='yes' id='type-id-802'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > > -->
-    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-803'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >* -->
@@ -12172,7 +12172,7 @@
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >* const -->
     <qualified-type-def type-id='type-id-805' const='yes' id='type-id-806'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > > -->
-    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-807'/>
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-807'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >* -->
@@ -12180,7 +12180,7 @@
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >* const -->
     <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > > -->
-    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-811'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
     <!-- const __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >* -->
@@ -12218,19 +12218,19 @@
     <!-- const __gnu_cxx::new_allocator<std::_List_node<int> >* const -->
     <qualified-type-def type-id='type-id-828' const='yes' id='type-id-829'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-695' const='yes' id='type-id-734'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-711'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
     <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-830'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-    <qualified-type-def type-id='type-id-685' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-697' const='yes' id='type-id-735'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-713'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* -->
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-831'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-736'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-736'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-715'/>
     <!-- const __gnu_cxx::new_allocator<std::pair<const int, void*> >* -->
@@ -12340,9 +12340,9 @@
     <!-- const std::_Bit_reference* const -->
     <qualified-type-def type-id='type-id-874' const='yes' id='type-id-875'/>
     <!-- const std::_Bit_type -->
-    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-515'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-518'/>
     <!-- const std::_Bit_type* -->
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-479'/>
     <!-- const std::_Bvector_base<std::allocator<bool> > -->
     <qualified-type-def type-id='type-id-876' const='yes' id='type-id-877'/>
     <!-- const std::_Bvector_base<std::allocator<bool> >* -->
@@ -12382,19 +12382,19 @@
     <!-- const std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >* const -->
     <qualified-type-def type-id='type-id-899' const='yes' id='type-id-900'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-901'/>
+    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-901'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
     <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
     <qualified-type-def type-id='type-id-902' const='yes' id='type-id-903'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-904'/>
+    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-904'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
     <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-905'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
     <qualified-type-def type-id='type-id-905' const='yes' id='type-id-906'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-907'/>
+    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-907'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
     <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
     <!-- const std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
@@ -12416,15 +12416,15 @@
     <!-- const std::allocator<std::_List_node<int> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-921'/>
     <!-- const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-620'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-620'/>
     <!-- const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-620' size-in-bits='64' id='type-id-580'/>
     <!-- const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-621'/>
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-621'/>
     <!-- const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-583'/>
     <!-- const std::allocator<std::pair<const int, void*> > -->
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-622'/>
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-622'/>
     <!-- const std::allocator<std::pair<const int, void*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-586'/>
     <!-- const std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> -->
@@ -12432,29 +12432,29 @@
     <!-- const std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback>& -->
     <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > > -->
-    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-689'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-701'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-628'/>
+    <reference-type-def kind='lvalue' type-id='type-id-701' size-in-bits='64' id='type-id-628'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-702'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-637'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-638'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > > -->
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-703'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-631'/>
+    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-631'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-692'/>
+    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-704'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-645'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > > -->
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-693'/>
+    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-705'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-693' size-in-bits='64' id='type-id-634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-705' size-in-bits='64' id='type-id-634'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-706'/>
     <!-- const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-694' size-in-bits='64' id='type-id-651'/>
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-652'/>
     <!-- const std::equal_to<int> -->
     <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
     <!-- const std::equal_to<int>& -->
@@ -12528,27 +12528,27 @@
     <!-- const std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >* const -->
     <qualified-type-def type-id='type-id-966' const='yes' id='type-id-967'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-707'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-639'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
-    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-968'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
     <qualified-type-def type-id='type-id-968' const='yes' id='type-id-969'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-708'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-646'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
-    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-970'/>
+    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-970'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-697'/>
+    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-709'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-697' size-in-bits='64' id='type-id-652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-709' size-in-bits='64' id='type-id-653'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
-    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-972'/>
     <!-- const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
     <qualified-type-def type-id='type-id-972' const='yes' id='type-id-973'/>
     <!-- const unsigned long int& -->
@@ -12560,23 +12560,23 @@
     <!-- const unsigned long int*& -->
     <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-977'/>
     <!-- const vtkMultiProcessController -->
-    <qualified-type-def type-id='type-id-533' const='yes' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-587'/>
     <!-- const vtkMultiProcessController& -->
     <reference-type-def kind='lvalue' type-id='type-id-587' size-in-bits='64' id='type-id-562'/>
     <!-- const vtkMultiProcessController* -->
     <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-567'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback -->
-    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-520'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback& -->
     <qualified-type-def type-id='type-id-978' id='type-id-979'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback& -->
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-978'/>
+    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-978'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* -->
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-459'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* const -->
-    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-539'/>
+    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-540'/>
     <!-- const vtkMultiProcessController::vtkInternal::vtkRMICallback* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-506'/>
     <!-- const vtkSmartPointer<vtkProcessGroup> -->
     <qualified-type-def type-id='type-id-764' const='yes' id='type-id-980'/>
     <!-- const vtkSmartPointer<vtkProcessGroup>* -->
@@ -12676,51 +12676,51 @@
     <!-- const vtksys::hash_map<int, void*, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >* -->
     <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
     <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > -->
-    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-661'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-665'/>
     <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-606'/>
+    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-606'/>
     <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >* -->
-    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-1031'/>
+    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-1031'/>
     <!-- const vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >* const -->
     <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1032'/>
     <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)> -->
-    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-662'/>
+    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-666'/>
     <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-662' size-in-bits='64' id='type-id-612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-612'/>
     <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>* -->
-    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-1033'/>
+    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1033'/>
     <!-- const vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>* const -->
     <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1034'/>
     <!-- const vtksys::hash_select1st<const int, void*> -->
-    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-663'/>
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-667'/>
     <!-- const vtksys::hash_select1st<const int, void*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-618'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-618'/>
     <!-- const vtksys::hash_select1st<const int, void*>* -->
-    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-1035'/>
+    <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-1035'/>
     <!-- const vtksys::hash_select1st<const int, void*>* const -->
     <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1036'/>
     <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-664'/>
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-668'/>
     <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-607'/>
     <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-1037'/>
     <!-- const vtksys::hashtable<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> >* const -->
     <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1038'/>
     <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-665'/>
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-669'/>
     <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-613'/>
     <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-1039'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-1039'/>
     <!-- const vtksys::hashtable<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)>, std::equal_to<int>, std::allocator<char> >* const -->
     <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1040'/>
     <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> > -->
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-666'/>
+    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-670'/>
     <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-619'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-619'/>
     <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> >* -->
-    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1041'/>
+    <pointer-type-def type-id='type-id-670' size-in-bits='64' id='type-id-1041'/>
     <!-- const vtksys::hashtable<std::pair<const int, void*>, int, vtksys::hash<int>, vtksys::hash_select1st<const int, void*>, std::equal_to<int>, std::allocator<char> >* const -->
     <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1042'/>
     <!-- std::_Bit_const_iterator* -->
@@ -12784,23 +12784,23 @@
     <!-- std::_Vector_base<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >::_Vector_impl* -->
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1079'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-686'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
-    <qualified-type-def type-id='type-id-701' const='yes' id='type-id-1080'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-1080'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-685'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-705'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-690'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
-    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-1081'/>
+    <qualified-type-def type-id='type-id-690' const='yes' id='type-id-1081'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-704'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-689'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-650' size-in-bits='64' id='type-id-694'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
-    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-694' const='yes' id='type-id-1082'/>
     <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-693'/>
     <!-- std::allocator<bool>* -->
     <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1083'/>
     <!-- std::allocator<int>& -->
@@ -12816,11 +12816,11 @@
     <!-- std::allocator<std::_List_node<int> >* -->
     <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-1089'/>
     <!-- std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* -->
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-684'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-696'/>
     <!-- std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* -->
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-686'/>
+    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-698'/>
     <!-- std::allocator<std::pair<const int, void*> >* -->
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-688'/>
+    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-700'/>
     <!-- std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback>& -->
     <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-1090'/>
     <!-- std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback>* -->
@@ -12830,25 +12830,25 @@
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
     <qualified-type-def type-id='type-id-1092' id='type-id-1093'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1092'/>
+    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1092'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>* -->
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-717'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > >* -->
     <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
     <qualified-type-def type-id='type-id-1094' id='type-id-1095'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-1094'/>
+    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-1094'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>* -->
-    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-719'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> > >* -->
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>& -->
     <qualified-type-def type-id='type-id-1096' id='type-id-1097'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1096'/>
+    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-1096'/>
     <!-- std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>* -->
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-721'/>
     <!-- std::list<int, std::allocator<int> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1098'/>
     <!-- std::list<int, std::allocator<int> >* -->
@@ -12898,25 +12898,25 @@
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1120'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* -->
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-636'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-637'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const -->
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-639'/>
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-640'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >& -->
     <qualified-type-def type-id='type-id-1122' id='type-id-1123'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1122'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* -->
-    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-643'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-644'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const -->
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-646'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-647'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >& -->
     <qualified-type-def type-id='type-id-1124' id='type-id-1125'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-1124'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* -->
-    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-651'/>
     <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const -->
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-653'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-654'/>
     <!-- unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-4' size-in-bits='64' id='type-id-1126'/>
     <!-- void (vtkMultiProcessController*, void*)* -->
@@ -12936,11 +12936,11 @@
     <!-- void*& -->
     <reference-type-def kind='lvalue' type-id='type-id-14' size-in-bits='64' id='type-id-589'/>
     <!-- vtkMultiProcessController& -->
-    <reference-type-def kind='lvalue' type-id='type-id-533' size-in-bits='64' id='type-id-1132'/>
+    <reference-type-def kind='lvalue' type-id='type-id-534' size-in-bits='64' id='type-id-1132'/>
     <!-- vtkMultiProcessController* const -->
     <qualified-type-def type-id='type-id-561' const='yes' id='type-id-563'/>
     <!-- vtkMultiProcessController::vtkInternal* -->
-    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-560'/>
     <!-- vtkMultiProcessController::vtkInternal::vtkRMICallback& -->
     <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-1133'/>
     <!-- vtkMultiProcessController::vtkInternal::vtkRMICallback* -->
@@ -12996,7 +12996,7 @@
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const -->
     <qualified-type-def type-id='type-id-523' const='yes' id='type-id-522'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const& -->
-    <qualified-type-def type-id='type-id-477' id='type-id-641'/>
+    <qualified-type-def type-id='type-id-477' id='type-id-642'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-522' size-in-bits='64' id='type-id-477'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const* -->
@@ -13018,7 +13018,7 @@
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const -->
     <qualified-type-def type-id='type-id-525' const='yes' id='type-id-524'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const& -->
-    <qualified-type-def type-id='type-id-475' id='type-id-648'/>
+    <qualified-type-def type-id='type-id-475' id='type-id-649'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-524' size-in-bits='64' id='type-id-475'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const* -->
@@ -13040,7 +13040,7 @@
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const -->
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-526'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const& -->
-    <qualified-type-def type-id='type-id-476' id='type-id-655'/>
+    <qualified-type-def type-id='type-id-476' id='type-id-656'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-526' size-in-bits='64' id='type-id-476'/>
     <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >* const* -->
@@ -13096,7 +13096,7 @@
       <!-- struct std::bidirectional_iterator_tag -->
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='86' column='1' id='type-id-1169'>
         <!-- struct std::forward_iterator_tag -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-512'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-515'/>
       </class-decl>
       <!-- struct std::_Bit_iterator -->
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='186' column='1' id='type-id-859'>
@@ -13210,7 +13210,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::input_iterator_tag -->
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-540'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-533'/>
       <!-- struct std::random_access_iterator_tag -->
       <class-decl name='random_access_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-1173'>
         <!-- struct std::bidirectional_iterator_tag -->
@@ -13313,21 +13313,21 @@
       <!-- struct std::equal_to<int> -->
       <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
         <!-- struct std::binary_function<int, int, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
       </class-decl>
       <!-- struct std::binary_function<int, int, bool> -->
-      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-667'/>
+      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-635'/>
       <!-- struct std::unary_function<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-669'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-658'/>
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-610'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-642'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13336,9 +13336,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13347,13 +13347,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&' -->
             <parameter type-id='type-id-475'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13362,9 +13362,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >&' -->
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13373,7 +13373,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -13384,7 +13384,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**' -->
@@ -13399,7 +13399,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const' -->
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -13410,20 +13410,20 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >* const' -->
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >' -->
-            <parameter type-id='type-id-647' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-648' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >* const&' -->
-            <parameter type-id='type-id-648' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-649' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-703'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-688'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-718'/>
         <member-function access='private'>
@@ -13441,7 +13441,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>*' -->
             <parameter type-id='type-id-719' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13470,12 +13470,12 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-642'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-643'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-702'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-687'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-703'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-688'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -13492,7 +13492,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -13501,9 +13501,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-                <parameter type-id='type-id-644'/>
+                <parameter type-id='type-id-645'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -13512,13 +13512,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-702' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-687' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13527,9 +13527,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13538,11 +13538,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*>&' -->
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13551,7 +13551,7 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> >*' -->
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -13609,16 +13609,16 @@
         </member-function>
       </class-decl>
       <!-- struct std::unary_function<std::pair<const int, void*>, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-670'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-659'/>
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-616'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-649'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-650'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13627,9 +13627,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13638,13 +13638,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void*> >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >* const&' -->
             <parameter type-id='type-id-476'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13653,9 +13653,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >&' -->
-            <parameter type-id='type-id-652'/>
+            <parameter type-id='type-id-653'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13664,7 +13664,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -13675,7 +13675,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, void*> >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, void*> >**, vtksys::_Hashtable_node<std::pair<const int, void*> >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >**' -->
@@ -13690,7 +13690,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const' -->
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -13701,20 +13701,20 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, void*> >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >* const' -->
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >' -->
-            <parameter type-id='type-id-654' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-655' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, void*> >* const&' -->
-            <parameter type-id='type-id-655' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-656' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-707'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-692'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-720'/>
         <member-function access='private'>
@@ -13732,7 +13732,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>*' -->
             <parameter type-id='type-id-721' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13761,12 +13761,12 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-649'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-650'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-706'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-691'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -13783,7 +13783,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -13792,9 +13792,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-                <parameter type-id='type-id-651'/>
+                <parameter type-id='type-id-652'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -13803,13 +13803,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-706' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13818,9 +13818,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13829,11 +13829,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*>&' -->
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13842,7 +13842,7 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> >*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -13898,16 +13898,16 @@
         </member-function>
       </class-decl>
       <!-- struct std::unary_function<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, const int> -->
-      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-668'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-657'/>
       <!-- class std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-604'>
         <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-function access='private'>
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13916,9 +13916,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13927,13 +13927,13 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&' -->
             <parameter type-id='type-id-477'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13942,9 +13942,9 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::vector(const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >&' -->
-            <parameter type-id='type-id-638'/>
+            <parameter type-id='type-id-639'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -13953,7 +13953,7 @@
           <!-- std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -13964,7 +13964,7 @@
           <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_allocate_and_copy<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**>(unsigned long int, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**) -->
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**' -->
@@ -13979,7 +13979,7 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::reserve(size_t) -->
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const' -->
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <!-- void -->
@@ -13990,20 +13990,20 @@
           <!-- void std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_fill_insert(__gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >, size_t, vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&) -->
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
             <!-- implicit parameter of type 'std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >* const' -->
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >' -->
-            <parameter type-id='type-id-640' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-641' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- parameter of type 'vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >* const&' -->
-            <parameter type-id='type-id-641' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-642' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-699'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-684'>
         <!-- class __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-716'/>
         <member-function access='private'>
@@ -14021,7 +14021,7 @@
             <!-- implicit parameter of type 'std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>*' -->
             <parameter type-id='type-id-717' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -14079,12 +14079,12 @@
         </member-function>
       </class-decl>
       <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > -->
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-635'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-636'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-698'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-683'>
             <!-- class std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> -->
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-684'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -14101,7 +14101,7 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -14110,9 +14110,9 @@
               <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl::_Vector_impl(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl*' -->
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-                <parameter type-id='type-id-637'/>
+                <parameter type-id='type-id-638'/>
                 <!-- void -->
                 <return type-id='type-id-29'/>
               </function-decl>
@@ -14121,13 +14121,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_impl std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-698' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-683' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -14136,9 +14136,9 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base(const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -14147,11 +14147,11 @@
           <!-- void std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::_Vector_base(unsigned long int, const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*>&' -->
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -14160,7 +14160,7 @@
           <!-- std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> >*' -->
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -14466,9 +14466,9 @@
         </member-function>
       </class-decl>
       <!-- struct std::forward_iterator_tag -->
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-512'>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-515'>
         <!-- struct std::input_iterator_tag -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-540'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
       </class-decl>
       <!-- struct std::_List_iterator<int> -->
       <class-decl name='_List_iterator&lt;int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-884'>
@@ -15271,14 +15271,14 @@
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-656'>
+      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-660'>
         <!-- class __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-683'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-695'/>
         <member-function access='private'>
           <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -15287,7 +15287,7 @@
           <!-- void std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::allocator(const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >&' -->
             <parameter type-id='type-id-580'/>
             <!-- void -->
@@ -15298,7 +15298,7 @@
           <!-- std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*' -->
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -15307,14 +15307,14 @@
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-657'>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-661'>
         <!-- class __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-685'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-697'/>
         <member-function access='private'>
           <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -15323,7 +15323,7 @@
           <!-- void std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::allocator(const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >&' -->
             <parameter type-id='type-id-583'/>
             <!-- void -->
@@ -15334,7 +15334,7 @@
           <!-- std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*' -->
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -15343,14 +15343,14 @@
         </member-function>
       </class-decl>
       <!-- class std::allocator<std::pair<const int, void*> > -->
-      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-658'>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-662'>
         <!-- class __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
         <member-function access='private'>
           <!-- void std::allocator<std::pair<const int, void*> >::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -15359,7 +15359,7 @@
           <!-- void std::allocator<std::pair<const int, void*> >::allocator(const std::allocator<std::pair<const int, void*> >&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<std::pair<const int, void*> >&' -->
             <parameter type-id='type-id-586'/>
             <!-- void -->
@@ -15370,7 +15370,7 @@
           <!-- std::allocator<std::pair<const int, void*> >::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<std::pair<const int, void*> >*' -->
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -16736,7 +16736,7 @@
       <!-- struct vtksys::hash_select1st<const int, void (*)(vtkMultiProcessController*, void*)> -->
       <class-decl name='hash_select1st&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-609'>
         <!-- struct std::unary_function<std::pair<const int, void (*)(vtkMultiProcessController*, void*)>, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-669'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-658'/>
       </class-decl>
       <!-- class vtksys::hash_map<int, void*, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> > -->
       <class-decl name='hash_map&lt;int, void*, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-557'>
@@ -16883,7 +16883,7 @@
       <!-- struct vtksys::hash_select1st<const int, void*> -->
       <class-decl name='hash_select1st&lt;const int, void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-615'>
         <!-- struct std::unary_function<std::pair<const int, void*>, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-670'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-659'/>
       </class-decl>
       <!-- class vtksys::hash_map<int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> >, vtksys::hash<int>, std::equal_to<int>, std::allocator<char> > -->
       <class-decl name='hash_map&lt;int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-555'>
@@ -17030,7 +17030,7 @@
       <!-- struct vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > -->
       <class-decl name='hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-603'>
         <!-- struct std::unary_function<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, const int> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-668'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-657'/>
       </class-decl>
       <!-- struct vtksys::_Hashtable_iterator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, int, vtksys::hash<int>, vtksys::hash_select1st<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >, std::equal_to<int>, std::allocator<char> > -->
       <class-decl name='_Hashtable_iterator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, int, vtksys::hash&lt;int&gt;, vtksys::hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hashtable.hxx' line='330' column='1' id='type-id-999'>
@@ -17182,7 +17182,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-640'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-641'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -17209,7 +17209,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-647'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-648'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -17236,7 +17236,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > > -->
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-654'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-655'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- vtksys::_Hashtable_node<std::pair<const int, void*> >** __gnu_cxx::__normal_iterator<vtksys::_Hashtable_node<std::pair<const int, void*> >**, std::vector<vtksys::_Hashtable_node<std::pair<const int, void*> >*, std::allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
@@ -17664,7 +17664,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-685'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-697'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, void (*)(vtkMultiProcessController*, void*)> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17698,7 +17698,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, void*> > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-687'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-699'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, void*> >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17732,7 +17732,7 @@
         </member-function>
       </class-decl>
       <!-- class __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > > -->
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-683'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-695'>
         <member-function access='private'>
           <!-- void __gnu_cxx::new_allocator<std::pair<const int, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > > >::new_allocator() -->
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17872,7 +17872,7 @@
     <!-- const __gnu_cxx::new_allocator<unsigned char*>* const -->
     <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1244'/>
     <!-- const std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
-    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1245'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-1245'/>
     <!-- const std::_Deque_base<unsigned char, std::allocator<unsigned char> >* -->
     <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1246'/>
     <!-- const std::_Deque_base<unsigned char, std::allocator<unsigned char> >* const -->
@@ -17886,13 +17886,13 @@
     <!-- const std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>* const -->
     <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
-    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-537'/>
+    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-538'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>& -->
-    <qualified-type-def type-id='type-id-519' id='type-id-1252'/>
+    <qualified-type-def type-id='type-id-508' id='type-id-1252'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-519'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-508'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>* -->
-    <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-1253'/>
+    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1253'/>
     <!-- const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>* const -->
     <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1254'/>
     <!-- const std::allocator<unsigned char*> -->
@@ -17912,13 +17912,13 @@
     <!-- const std::char_traits<char>::char_type& -->
     <qualified-type-def type-id='type-id-264' id='type-id-1263'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> > -->
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-538'/>
+    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-539'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <qualified-type-def type-id='type-id-509' id='type-id-513'/>
+    <qualified-type-def type-id='type-id-512' id='type-id-516'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-512'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >* -->
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1264'/>
+    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-1264'/>
     <!-- const std::deque<unsigned char, std::allocator<unsigned char> >* const -->
     <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1265'/>
     <!-- const std::string& -->
@@ -17926,9 +17926,9 @@
     <!-- const std::vector<unsigned char, std::allocator<unsigned char> >& -->
     <qualified-type-def type-id='type-id-284' id='type-id-87'/>
     <!-- const unsigned char* const -->
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-519'/>
     <!-- const unsigned char* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-498'/>
     <!-- const vtkMultiProcessStream* const -->
     <qualified-type-def type-id='type-id-307' const='yes' id='type-id-64'/>
     <!-- double*& -->
@@ -17942,7 +17942,7 @@
     <!-- int*& -->
     <qualified-type-def type-id='type-id-337' id='type-id-73'/>
     <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* -->
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-531'/>
     <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >* const -->
     <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
     <!-- std::_Deque_base<unsigned char, std::allocator<unsigned char> >::_Deque_impl* -->
@@ -17950,15 +17950,15 @@
     <!-- std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>& -->
     <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-1266'/>
     <!-- std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>* -->
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-507'/>
     <!-- std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>* const -->
-    <qualified-type-def type-id='type-id-518' const='yes' id='type-id-1267'/>
+    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1267'/>
     <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>& -->
     <reference-type-def kind='lvalue' type-id='type-id-472' size-in-bits='64' id='type-id-1268'/>
     <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>* -->
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-509'/>
     <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>* const -->
-    <qualified-type-def type-id='type-id-520' const='yes' id='type-id-1269'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-1269'/>
     <!-- std::allocator<unsigned char*>* -->
     <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1270'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >* const -->
@@ -17968,11 +17968,11 @@
     <!-- std::char_traits<char>::char_type& -->
     <qualified-type-def type-id='type-id-378' id='type-id-1273'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-514'/>
+    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-517'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >* -->
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-511'/>
     <!-- std::deque<unsigned char, std::allocator<unsigned char> >* const -->
-    <qualified-type-def type-id='type-id-508' const='yes' id='type-id-511'/>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-514'/>
     <!-- std::string& -->
     <qualified-type-def type-id='type-id-385' id='type-id-71'/>
     <!-- std::vector<unsigned char, std::allocator<unsigned char> >& -->
@@ -18025,7 +18025,7 @@
           <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <!-- parameter of type 'unsigned char*' -->
             <parameter type-id='type-id-89'/>
             <!-- parameter of type 'unsigned char**' -->
@@ -18038,7 +18038,7 @@
           <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator() -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18047,9 +18047,9 @@
           <!-- void std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>*' -->
-            <parameter type-id='type-id-520' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-508'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18077,7 +18077,7 @@
           <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(unsigned char*, unsigned char**) -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
             <!-- parameter of type 'unsigned char*' -->
             <parameter type-id='type-id-89'/>
             <!-- parameter of type 'unsigned char**' -->
@@ -18090,7 +18090,7 @@
           <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator() -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18099,9 +18099,9 @@
           <!-- void std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>::_Deque_iterator(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>*' -->
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-508'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18110,12 +18110,12 @@
       <!-- class std::deque<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='deque&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='639' column='1' id='type-id-57'>
         <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-507'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-510'/>
         <member-function access='private'>
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque() -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18124,7 +18124,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(const std::allocator<unsigned char>&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<unsigned char>&' -->
             <parameter type-id='type-id-251'/>
             <!-- void -->
@@ -18135,7 +18135,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(unsigned long int, const unsigned char&, const std::allocator<unsigned char>&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='710' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-4'/>
             <!-- parameter of type 'const unsigned char&' -->
@@ -18150,9 +18150,9 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::deque(const std::deque<unsigned char, std::allocator<unsigned char> >&) -->
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'const std::deque<unsigned char, std::allocator<unsigned char> >&' -->
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-512'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18161,7 +18161,7 @@
           <!-- std::deque<unsigned char, std::allocator<unsigned char> >::~deque(int) -->
           <function-decl name='~deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <!-- void -->
@@ -18172,7 +18172,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_dispatch<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::__false_type) -->
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -18180,7 +18180,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18189,7 +18189,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_dispatch<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::__false_type) -->
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -18197,7 +18197,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
             <parameter type-id='type-id-482'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18206,7 +18206,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::insert<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>) -->
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -18221,7 +18221,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::insert<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>) -->
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >*' -->
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -18236,7 +18236,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_reallocate_map(size_t, bool) -->
           <function-decl name='_M_reallocate_map' mangled-name='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <!-- parameter of type 'bool' -->
@@ -18249,7 +18249,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_reserve_map_at_back(size_t) -->
           <function-decl name='_M_reserve_map_at_back' mangled-name='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1715' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -18260,7 +18260,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_new_elements_at_front(size_t) -->
           <function-decl name='_M_new_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -18271,7 +18271,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_new_elements_at_back(size_t) -->
           <function-decl name='_M_new_elements_at_back' mangled-name='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <!-- void -->
@@ -18282,7 +18282,7 @@
           <!-- std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> std::deque<unsigned char, std::allocator<unsigned char> >::_M_reserve_elements_at_front(size_t) -->
           <function-decl name='_M_reserve_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1'/>
             <!-- struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> -->
@@ -18293,7 +18293,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, size_t) -->
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -18310,7 +18310,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_range_insert_aux<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::forward_iterator_tag) -->
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
@@ -18318,7 +18318,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <!-- parameter of type 'struct std::forward_iterator_tag' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18327,7 +18327,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, size_t, const unsigned char&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <!-- parameter of type 'typedef size_t' -->
@@ -18342,7 +18342,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_insert_aux<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, size_t) -->
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -18359,7 +18359,7 @@
           <!-- void std::deque<unsigned char, std::allocator<unsigned char> >::_M_range_insert_aux<std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*> >(std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>, std::forward_iterator_tag) -->
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>' -->
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
@@ -18367,7 +18367,7 @@
             <!-- parameter of type 'struct std::_Deque_iterator<unsigned char, const unsigned char&, const unsigned char*>' -->
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <!-- parameter of type 'struct std::forward_iterator_tag' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -18376,16 +18376,16 @@
           <!-- std::deque<unsigned char, std::allocator<unsigned char> >& std::deque<unsigned char, std::allocator<unsigned char> >::operator=(const std::deque<unsigned char, std::allocator<unsigned char> >&) -->
           <function-decl name='operator=' mangled-name='_ZNSt5dequeIhSaIhEEaSERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEEaSERKS1_'>
             <!-- implicit parameter of type 'std::deque<unsigned char, std::allocator<unsigned char> >* const' -->
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <!-- parameter of type 'const std::deque<unsigned char, std::allocator<unsigned char> >&' -->
-            <parameter type-id='type-id-513' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
+            <parameter type-id='type-id-516' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
             <!-- std::deque<unsigned char, std::allocator<unsigned char> >& -->
-            <return type-id='type-id-514'/>
+            <return type-id='type-id-517'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
-      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-507'>
+      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-510'>
         <member-type access='protected'>
           <!-- enum std::_Deque_base<unsigned char, std::allocator<unsigned char> >::__anonymous_enum__ -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-528'>
@@ -18574,13 +18574,13 @@
         </member-function>
       </class-decl>
       <!-- struct std::__false_type -->
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-510'/>
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-513'/>
       <!-- bool std::operator==<unsigned char, unsigned char&, unsigned char*>(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&, const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
       <function-decl name='operator==&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- bool -->
         <return type-id='type-id-1'/>
       </function-decl>
@@ -18594,7 +18594,7 @@
       <!-- std::random_access_iterator_tag std::__iterator_category<std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*> >(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
       <function-decl name='__iterator_category&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- struct std::random_access_iterator_tag -->
         <return type-id='type-id-1173'/>
       </function-decl>
@@ -18736,9 +18736,9 @@
       <!-- bool std::operator!=<unsigned char, unsigned char&, unsigned char*>(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&, const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
       <function-decl name='operator!=&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- bool -->
         <return type-id='type-id-1'/>
       </function-decl>
@@ -19061,9 +19061,9 @@
       <!-- ptrdiff_t std::operator&#45;<unsigned char, unsigned char&, unsigned char*>(const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&, const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&) -->
       <function-decl name='operator-&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- parameter of type 'const std::_Deque_iterator<unsigned char, unsigned char&, unsigned char*>&' -->
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <!-- typedef ptrdiff_t -->
         <return type-id='type-id-49'/>
       </function-decl>
@@ -19215,21 +19215,21 @@
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcess -->
-    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-663'/>
     <!-- const vtkProcess& -->
-    <reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-594'/>
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-594'/>
     <!-- const vtkProcess* -->
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-596'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-596'/>
     <!-- vtkProcess* const -->
     <qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- const vtkProcessGroup -->
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
+    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-664'/>
     <!-- const vtkProcessGroup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-597'/>
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-597'/>
     <!-- const vtkProcessGroup* -->
-    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-599'/>
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-599'/>
     <!-- vtkProcessGroup* const -->
     <qualified-type-def type-id='type-id-569' const='yes' id='type-id-598'/>
     <!-- namespace std -->
@@ -20259,9 +20259,9 @@
     <!-- const __gnu_cxx::new_allocator<std::vector<char, std::allocator<char> > >* -->
     <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-1366'/>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-536'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-537'/>
     <!-- const char* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-504'/>
     <!-- const std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > > -->
     <qualified-type-def type-id='type-id-1367' const='yes' id='type-id-1368'/>
     <!-- const std::_List_base<std::vector<char, std::allocator<char> >, std::allocator<std::vector<char, std::allocator<char> > > >* -->
@@ -20635,7 +20635,7 @@
       <!-- struct std::less<int> -->
       <class-decl name='less&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1433'>
         <!-- struct std::binary_function<int, int, bool> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
       </class-decl>
       <!-- struct std::_Rb_tree_node_base -->
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-1407'>
@@ -21019,7 +21019,7 @@
             <!-- parameter of type 'struct std::_List_const_iterator<std::vector<char, std::allocator<char> > >' -->
             <parameter type-id='type-id-1371'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -21411,7 +21411,7 @@
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-34'/>
             <!-- parameter of type 'struct std::__false_type' -->
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -21443,7 +21443,7 @@
             <!-- parameter of type 'char*' -->
             <parameter type-id='type-id-34' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='480' column='1'/>
             <!-- parameter of type 'struct std::forward_iterator_tag' -->
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <!-- void -->
             <return type-id='type-id-29'/>
           </function-decl>
@@ -21576,7 +21576,7 @@
         <!-- parameter of type 'struct std::_List_const_iterator<std::vector<char, std::allocator<char> > >' -->
         <parameter type-id='type-id-1371'/>
         <!-- parameter of type 'struct std::input_iterator_tag' -->
-        <parameter type-id='type-id-540'/>
+        <parameter type-id='type-id-533'/>
         <!-- typedef ptrdiff_t -->
         <return type-id='type-id-49'/>
       </function-decl>
@@ -22266,7 +22266,7 @@
     <!-- class vtkSocketController -->
     <class-decl name='vtkSocketController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.h' line='47' column='1' id='type-id-1549'>
       <!-- struct vtkMultiProcessController -->
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
       <data-member access='protected' static='yes'>
         <!-- static int vtkSocketController::Initialized -->
         <var-decl name='Initialized' type-id='type-id-19' mangled-name='_ZN19vtkSocketController11InitializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' line='27' column='1' elf-symbol-id='_ZN19vtkSocketController11InitializedE'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 9e24288a..62dadede 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -2410,6 +2410,100 @@
       <!-- char* -->
       <return type-id='type-id-51'/>
     </function-decl>
+    <!-- struct ht_identifier -->
+    <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-79'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- const unsigned char* ht_identifier::str -->
+        <var-decl name='str' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- unsigned int ht_identifier::len -->
+        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='34' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <!-- unsigned int ht_identifier::hash_value -->
+        <var-decl name='hash_value' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='35' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct pex_obj -->
+    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-130'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int pex_obj::flags -->
+        <var-decl name='flags' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- const char* pex_obj::pname -->
+        <var-decl name='pname' type-id='type-id-15' visibility='default' filepath='../.././libiberty/pex-common.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <!-- const char* pex_obj::tempbase -->
+        <var-decl name='tempbase' type-id='type-id-15' visibility='default' filepath='../.././libiberty/pex-common.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <!-- int pex_obj::next_input -->
+        <var-decl name='next_input' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <!-- char* pex_obj::next_input_name -->
+        <var-decl name='next_input_name' type-id='type-id-51' visibility='default' filepath='../.././libiberty/pex-common.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <!-- int pex_obj::next_input_name_allocated -->
+        <var-decl name='next_input_name_allocated' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='67' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='352'>
+        <!-- int pex_obj::stderr_pipe -->
+        <var-decl name='stderr_pipe' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='69' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <!-- int pex_obj::count -->
+        <var-decl name='count' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='448'>
+        <!-- pid_t* pex_obj::children -->
+        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='512'>
+        <!-- int* pex_obj::status -->
+        <var-decl name='status' type-id='type-id-42' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='576'>
+        <!-- pex_time* pex_obj::time -->
+        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='640'>
+        <!-- int pex_obj::number_waited -->
+        <var-decl name='number_waited' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='704'>
+        <!-- FILE* pex_obj::input_file -->
+        <var-decl name='input_file' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='768'>
+        <!-- FILE* pex_obj::read_output -->
+        <var-decl name='read_output' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='83' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='832'>
+        <!-- FILE* pex_obj::read_err -->
+        <var-decl name='read_err' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='85' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='896'>
+        <!-- int pex_obj::remove_count -->
+        <var-decl name='remove_count' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='87' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='960'>
+        <!-- char** pex_obj::remove -->
+        <var-decl name='remove' type-id='type-id-123' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1024'>
+        <!-- const pex_funcs* pex_obj::funcs -->
+        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='1088'>
+        <!-- void* pex_obj::sysdep -->
+        <var-decl name='sysdep' type-id='type-id-14' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
+      </data-member>
+    </class-decl>
     <!-- enum node_type -->
     <enum-decl name='node_type' filepath='../.././libcpp/include/cpplib.h' line='614' column='1' id='type-id-80'>
       <underlying-type type-id='type-id-26'/>
@@ -2522,100 +2616,6 @@
       <!-- void* -->
       <return type-id='type-id-14'/>
     </function-type>
-    <!-- struct ht_identifier -->
-    <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-79'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- const unsigned char* ht_identifier::str -->
-        <var-decl name='str' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- unsigned int ht_identifier::len -->
-        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='34' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <!-- unsigned int ht_identifier::hash_value -->
-        <var-decl name='hash_value' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/symtab.h' line='35' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct pex_obj -->
-    <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-130'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int pex_obj::flags -->
-        <var-decl name='flags' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- const char* pex_obj::pname -->
-        <var-decl name='pname' type-id='type-id-15' visibility='default' filepath='../.././libiberty/pex-common.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <!-- const char* pex_obj::tempbase -->
-        <var-decl name='tempbase' type-id='type-id-15' visibility='default' filepath='../.././libiberty/pex-common.h' line='61' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <!-- int pex_obj::next_input -->
-        <var-decl name='next_input' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='63' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <!-- char* pex_obj::next_input_name -->
-        <var-decl name='next_input_name' type-id='type-id-51' visibility='default' filepath='../.././libiberty/pex-common.h' line='65' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <!-- int pex_obj::next_input_name_allocated -->
-        <var-decl name='next_input_name_allocated' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='67' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='352'>
-        <!-- int pex_obj::stderr_pipe -->
-        <var-decl name='stderr_pipe' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='69' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <!-- int pex_obj::count -->
-        <var-decl name='count' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='448'>
-        <!-- pid_t* pex_obj::children -->
-        <var-decl name='children' type-id='type-id-146' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='512'>
-        <!-- int* pex_obj::status -->
-        <var-decl name='status' type-id='type-id-42' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='576'>
-        <!-- pex_time* pex_obj::time -->
-        <var-decl name='time' type-id='type-id-147' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='640'>
-        <!-- int pex_obj::number_waited -->
-        <var-decl name='number_waited' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='704'>
-        <!-- FILE* pex_obj::input_file -->
-        <var-decl name='input_file' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='81' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='768'>
-        <!-- FILE* pex_obj::read_output -->
-        <var-decl name='read_output' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='83' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='832'>
-        <!-- FILE* pex_obj::read_err -->
-        <var-decl name='read_err' type-id='type-id-89' visibility='default' filepath='../.././libiberty/pex-common.h' line='85' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='896'>
-        <!-- int pex_obj::remove_count -->
-        <var-decl name='remove_count' type-id='type-id-18' visibility='default' filepath='../.././libiberty/pex-common.h' line='87' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='960'>
-        <!-- char** pex_obj::remove -->
-        <var-decl name='remove' type-id='type-id-123' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1024'>
-        <!-- const pex_funcs* pex_obj::funcs -->
-        <var-decl name='funcs' type-id='type-id-148' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- void* pex_obj::sysdep -->
-        <var-decl name='sysdep' type-id='type-id-14' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
-      </data-member>
-    </class-decl>
     <!-- union _cpp_hashnode_value -->
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-81'>
       <data-member access='private'>
@@ -2663,10 +2663,6 @@
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
-    <!-- const pex_funcs -->
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
-    <!-- const unsigned char -->
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-154'/>
     <!-- struct answer -->
     <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -2679,7 +2675,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct pex_time -->
@@ -2701,23 +2697,22 @@
         <var-decl name='system_microseconds' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const pex_funcs -->
+    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-153'/>
+    <!-- const unsigned char -->
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-154'/>
     <!-- typedef cpp_macro cpp_macro -->
     <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
-    <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-4' id='type-id-7'/>
-    </array-type-def>
     <!-- struct cpp_macro -->
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
         <!-- union cpp_macro::cpp_macro_u -->
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-162'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
@@ -2727,11 +2722,11 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_macro::cpp_macro_u cpp_macro::exp -->
-        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- source_location cpp_macro::line -->
@@ -2771,78 +2766,73 @@
       </data-member>
     </class-decl>
     <!-- struct pex_funcs -->
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
-        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
-        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
-        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int (pex_obj*, int)* pex_funcs::close -->
-        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
-        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
-        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
-        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
-        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- void (pex_obj*)* pex_funcs::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
+    <!-- cpp_token[1] -->
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='192' id='type-id-158'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-4' id='type-id-7'/>
+    </array-type-def>
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
     <!-- FILE* (pex_obj*, int, int)* -->
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
-    <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-165'/>
-    <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
-    <!-- int (pex_obj*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
-    <!-- int (pex_obj*, int)* -->
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
-    <!-- int (pex_obj*, int*, int)* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-170'/>
     <!-- struct cpp_token -->
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-172'>
       <member-type access='public'>
         <!-- union cpp_token::cpp_token_u -->
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-174'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
-            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
-            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
-            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
@@ -2860,7 +2850,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <!-- unsigned short int cpp_token::flags -->
@@ -2868,17 +2858,52 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_token::cpp_token_u cpp_token::val -->
-        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-174' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
+    <!-- cpp_hashnode** -->
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-164'/>
+    <!-- cpp_token* -->
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-163'/>
+    <!-- int (pex_obj*, const char*, int)* -->
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-165'/>
+    <!-- int (pex_obj*, int)* -->
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-167'/>
+    <!-- int (pex_obj*, int*, int)* -->
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-169'/>
     <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-166'/>
     <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-168'/>
     <!-- void (pex_obj*)* -->
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-171'/>
+    <!-- struct cpp_identifier -->
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-175'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- cpp_hashnode* cpp_identifier::node -->
+        <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct cpp_macro_arg -->
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-177'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- unsigned int cpp_macro_arg::arg_no -->
+        <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct cpp_string -->
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-176'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- unsigned int cpp_string::len -->
+        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <!-- const unsigned char* cpp_string::text -->
+        <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
+      </data-member>
+    </class-decl>
     <!-- enum cpp_ttype -->
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-178'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -2968,31 +2993,6 @@
       <enumerator name='CPP_LAST_PUNCTUATOR' value='52'/>
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
-    <!-- struct cpp_identifier -->
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- cpp_hashnode* cpp_identifier::node -->
-        <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct cpp_macro_arg -->
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- unsigned int cpp_macro_arg::arg_no -->
-        <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
-      </data-member>
-    </class-decl>
-    <!-- struct cpp_string -->
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <!-- unsigned int cpp_string::len -->
-        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <!-- const unsigned char* cpp_string::text -->
-        <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
-      </data-member>
-    </class-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- struct line_maps -->
@@ -5229,7 +5229,7 @@
       <!-- parameter of type 'cpp_string*' -->
       <parameter type-id='type-id-262'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5244,7 +5244,7 @@
       <!-- parameter of type 'cpp_string*' -->
       <parameter type-id='type-id-262'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5318,12 +5318,6 @@
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-264'/>
-    <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
-    <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
-    <!-- const uchar -->
-    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <!-- struct normalize_state -->
     <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -5336,25 +5330,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const cpp_string -->
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
+    <!-- const cpp_token -->
+    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-269'/>
+    <!-- const uchar -->
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <!-- typedef cpp_reader cpp_reader -->
     <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
+    <typedef-decl name='cpp_string' type-id='type-id-176' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
     <!-- typedef __off_t off_t -->
     <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-274'/>
     <!-- typedef unsigned char uchar -->
     <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-275'/>
-    <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='normalized_KC' value='0'/>
-      <enumerator name='normalized_C' value='1'/>
-      <enumerator name='normalized_identifier_C' value='2'/>
-      <enumerator name='normalized_none' value='3'/>
-    </enum-decl>
     <!-- struct cpp_reader -->
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-278'>
       <member-type access='public'>
@@ -5424,7 +5416,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -5496,7 +5488,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
         <!-- cpp_token* cpp_reader::cur_token -->
-        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
@@ -5552,11 +5544,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
@@ -5639,132 +5631,116 @@
         <var-decl name='forced_token_location_p' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
+    <!-- enum cpp_normalize_level -->
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-276'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='normalized_KC' value='0'/>
+      <enumerator name='normalized_C' value='1'/>
+      <enumerator name='normalized_identifier_C' value='2'/>
+      <enumerator name='normalized_none' value='3'/>
+    </enum-decl>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
+    <typedef-decl name='cpp_token' type-id='type-id-172' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
     <!-- _cpp_buff* -->
     <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
     <!-- _cpp_file* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
-    <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
-    <!-- const directive* -->
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
-    <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
-    <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
-    <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
-    <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
-    <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
-    <!-- deps* -->
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
-    <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
-    <!-- ht* -->
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
-    <!-- op* -->
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
-    <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
     <!-- struct cpp_callbacks -->
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-321'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -5777,20 +5753,20 @@
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-325'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -5808,7 +5784,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
@@ -5816,11 +5792,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-325' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-327' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
@@ -5851,29 +5827,29 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-332'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -5899,7 +5875,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -6067,7 +6043,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-276' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -6079,7 +6055,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -6122,7 +6098,7 @@
     <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
@@ -6211,6 +6187,30 @@
         <var-decl name='n__VA_ARGS__' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const cpp_hashnode* -->
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-291'/>
+    <!-- const directive* -->
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-286'/>
+    <!-- cpp_buffer* -->
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-281'/>
+    <!-- cpp_context* -->
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <!-- cpp_dir* -->
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
+    <!-- cpp_savedstate* -->
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-302'/>
+    <!-- def_pragma_macro* -->
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-304'/>
+    <!-- deps* -->
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-295'/>
+    <!-- file_hash_entry_pool* -->
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-290'/>
+    <!-- ht* -->
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-298'/>
+    <!-- op* -->
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-299'/>
+    <!-- pragma_entry* -->
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-296'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
@@ -6220,53 +6220,11 @@
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-320'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-318'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
-    <!-- const char** -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
-    <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
-    <!-- const directive -->
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
-    <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
-    <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='CLK_GNUC89' value='0'/>
-      <enumerator name='CLK_GNUC99' value='1'/>
-      <enumerator name='CLK_GNUC11' value='2'/>
-      <enumerator name='CLK_STDC89' value='3'/>
-      <enumerator name='CLK_STDC94' value='4'/>
-      <enumerator name='CLK_STDC99' value='5'/>
-      <enumerator name='CLK_STDC11' value='6'/>
-      <enumerator name='CLK_GNUCXX' value='7'/>
-      <enumerator name='CLK_CXX98' value='8'/>
-      <enumerator name='CLK_GNUCXX11' value='9'/>
-      <enumerator name='CLK_CXX11' value='10'/>
-      <enumerator name='CLK_ASM' value='11'/>
-    </enum-decl>
-    <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
-      <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
-      <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
-    </enum-decl>
-    <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='DEPS_NONE' value='0'/>
-      <enumerator name='DEPS_USER' value='1'/>
-      <enumerator name='DEPS_SYSTEM' value='2'/>
-    </enum-decl>
-    <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
-    <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
     <!-- struct _cpp_buff -->
     <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6358,7 +6316,7 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-338'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -6381,7 +6339,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-351' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -6409,7 +6367,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -6441,9 +6399,9 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_savedstate -->
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-310'/>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-339'/>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-340'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
         <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
@@ -6474,10 +6432,10 @@
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-341'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -6489,7 +6447,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -6501,7 +6459,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
@@ -6517,20 +6475,20 @@
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry_pool -->
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-313'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-342'/>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-343'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
@@ -6562,14 +6520,14 @@
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-355' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -6577,11 +6535,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-178' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-316'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-345'/>
     <!-- struct tokenrun -->
     <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6594,18 +6552,18 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- cpp_token* tokenrun::limit -->
-        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
     <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -6616,16 +6574,58 @@
         <var-decl name='allocated' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
+    <!-- const char** -->
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-328'/>
+    <!-- const cpp_hashnode -->
+    <qualified-type-def type-id='type-id-357' const='yes' id='type-id-336'/>
+    <!-- const directive -->
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-337'/>
+    <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-317'/>
+    <!-- enum c_lang -->
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-334'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='CLK_GNUC89' value='0'/>
+      <enumerator name='CLK_GNUC99' value='1'/>
+      <enumerator name='CLK_GNUC11' value='2'/>
+      <enumerator name='CLK_STDC89' value='3'/>
+      <enumerator name='CLK_STDC94' value='4'/>
+      <enumerator name='CLK_STDC99' value='5'/>
+      <enumerator name='CLK_STDC11' value='6'/>
+      <enumerator name='CLK_GNUCXX' value='7'/>
+      <enumerator name='CLK_CXX98' value='8'/>
+      <enumerator name='CLK_GNUCXX11' value='9'/>
+      <enumerator name='CLK_CXX11' value='10'/>
+      <enumerator name='CLK_ASM' value='11'/>
+    </enum-decl>
+    <!-- enum context_tokens_kind -->
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-327'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
+      <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
+      <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
+    </enum-decl>
+    <!-- enum cpp_deps_style -->
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-333'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='DEPS_NONE' value='0'/>
+      <enumerator name='DEPS_USER' value='1'/>
+      <enumerator name='DEPS_SYSTEM' value='2'/>
+    </enum-decl>
+    <!-- int (cpp_reader*, const char*, int)* -->
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-314'/>
+    <!-- macro_context* -->
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-326'/>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-335'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-331'/>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-330'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-316'/>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
@@ -6636,47 +6636,47 @@
       </data-member>
     </union-decl>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-319'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-309'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-307'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-308'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-313'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-312'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-310'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-311'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-351'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
+    <!-- struct directive -->
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-358'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
     <!-- const cpp_token** -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-356'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-353'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
-    <!-- struct directive -->
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-352'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-352'/>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-357'/>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-355'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-354'/>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-361'/>
     <!-- struct cpp_num -->
     <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6699,7 +6699,7 @@
     <!-- struct if_stack -->
     <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-361' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -6719,8 +6719,6 @@
     <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <!-- typedef ht_identifier* hashnode -->
     <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
-    <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <!-- struct _cpp_line_note -->
     <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6743,12 +6741,14 @@
         <var-decl name='sloc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
+    <!-- ht_identifier* -->
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <!-- typedef unsigned long int cpp_num_part -->
     <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef void (cpp_reader*)* pragma_cb -->
-    <typedef-decl name='pragma_cb' type-id='type-id-329' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-319' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
     <!-- typedef cpp_options cpp_options -->
     <typedef-decl name='cpp_options' type-id='type-id-300' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-388'/>
     <!-- typedef cpp_callbacks cpp_callbacks -->
@@ -7212,7 +7212,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-355'/>
     <!-- struct cpp_num -->
     <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -7257,42 +7257,42 @@
     <!-- cpp_ttype cpp_userdef_string_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_remove_type' mangled-name='_Z30cpp_userdef_string_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z30cpp_userdef_string_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-181'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_string_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_add_type' mangled-name='_Z27cpp_userdef_string_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_userdef_string_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-181'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_remove_type' mangled-name='_Z28cpp_userdef_char_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_userdef_char_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-181'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_add_type' mangled-name='_Z25cpp_userdef_char_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_userdef_char_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-181'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <!-- bool cpp_userdef_string_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_p' mangled-name='_Z20cpp_userdef_string_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_userdef_string_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- bool cpp_userdef_char_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_p' mangled-name='_Z18cpp_userdef_char_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_userdef_char_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -7310,7 +7310,7 @@
       <!-- parameter of type 'const cpp_token*' -->
       <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-338' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-328' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-13'/>
     </function-decl>
@@ -7323,7 +7323,7 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-360'/>
+      <return type-id='type-id-355'/>
     </function-decl>
     <!-- op* _cpp_expand_op_stack(cpp_reader*) -->
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
@@ -7335,11 +7335,11 @@
     <!-- cpp_num cpp_num_sign_extend(cpp_num, size_t) -->
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
       <!-- parameter of type 'typedef cpp_num' -->
-      <parameter type-id='type-id-360' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-355' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-32' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-360'/>
+      <return type-id='type-id-355'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
@@ -7782,6 +7782,8 @@
       <!-- typedef size_t -->
       <return type-id='type-id-32'/>
     </function-decl>
+    <!-- struct __dirstream -->
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
     <!-- int (void**, void*) -->
     <function-type size-in-bits='64' id='type-id-408'>
       <!-- parameter of type 'void**' -->
@@ -7791,8 +7793,6 @@
       <!-- int -->
       <return type-id='type-id-18'/>
     </function-type>
-    <!-- struct __dirstream -->
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
@@ -7862,7 +7862,7 @@
     <!-- hash_table* -->
     <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
+    <typedef-decl name='hash_table' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const unsigned char[256] -->
@@ -7880,14 +7880,14 @@
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-334' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- cpp_reader* cpp_create_reader(c_lang, hash_table*, line_maps*) -->
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-334' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'hash_table*' -->
       <parameter type-id='type-id-412' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'line_maps*' -->
@@ -7968,7 +7968,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_context cpp_context -->
@@ -8048,7 +8048,7 @@
     <!-- const char* cpp_type2name(cpp_ttype, unsigned char) -->
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- parameter of type 'unsigned char' -->
       <parameter type-id='type-id-27' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- const char* -->
@@ -8113,7 +8113,7 @@
     <!-- cpp_token_fld_kind cpp_token_val_index(cpp_token*) -->
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
       <!-- parameter of type 'cpp_token*' -->
-      <parameter type-id='type-id-164' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <parameter type-id='type-id-163' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <!-- enum cpp_token_fld_kind -->
       <return type-id='type-id-417'/>
     </function-decl>
@@ -8173,37 +8173,37 @@
     <!-- const char* cpp_named_operator2name(cpp_ttype) -->
     <function-decl name='cpp_named_operator2name' mangled-name='cpp_named_operator2name' filepath='../.././libcpp/internal.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpp_named_operator2name'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <!-- const char* -->
       <return type-id='type-id-15'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='192' id='type-id-158'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
     <!-- struct cpp_token -->
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-172'>
       <member-type access='public'>
         <!-- union cpp_token::cpp_token_u -->
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-174'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
-            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
-            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
-            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
@@ -8221,7 +8221,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <!-- unsigned short int cpp_token::flags -->
@@ -8229,7 +8229,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_token::cpp_token_u cpp_token::val -->
-        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-174' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct ht_identifier -->
@@ -8276,18 +8276,18 @@
     <!-- typedef cpp_macro cpp_macro -->
     <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
+    <typedef-decl name='cpp_token' type-id='type-id-172' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
     <!-- struct cpp_identifier -->
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-175'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* cpp_identifier::node -->
         <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-357'/>
     <!-- struct cpp_macro_arg -->
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-177'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_macro_arg::arg_no -->
         <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
@@ -8297,10 +8297,10 @@
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
         <!-- union cpp_macro::cpp_macro_u -->
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-162'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
@@ -8310,11 +8310,11 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_macro::cpp_macro_u cpp_macro::exp -->
-        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- source_location cpp_macro::line -->
@@ -8354,7 +8354,7 @@
       </data-member>
     </class-decl>
     <!-- enum cpp_ttype -->
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-178'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -8456,7 +8456,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum cpp_builtin_type -->
@@ -8476,7 +8476,7 @@
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
     <!-- struct cpp_string -->
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_string::len -->
         <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
@@ -8493,11 +8493,11 @@
     <!-- const unsigned char* -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
     <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-164'/>
     <!-- cpp_macro* -->
     <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
     <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-163'/>
     <!-- void linemap_init(line_maps*) -->
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
@@ -8893,7 +8893,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -8965,7 +8965,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
         <!-- cpp_token* cpp_reader::cur_token -->
-        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
@@ -9021,11 +9021,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
@@ -9109,10 +9109,10 @@
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-341'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -9124,7 +9124,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -9136,7 +9136,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
@@ -9152,7 +9152,7 @@
       </data-member>
     </class-decl>
     <!-- typedef cpp_buffer cpp_buffer -->
-    <typedef-decl name='cpp_buffer' type-id='type-id-309' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-419'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-338' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-419'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
     <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
     <!-- struct _cpp_line_note -->
@@ -9194,30 +9194,30 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-330'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-331'/>
     <!-- struct cset_converter -->
     <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
@@ -9229,7 +9229,7 @@
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-335'/>
     <!-- struct lexer_state -->
     <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -9290,18 +9290,18 @@
       </data-member>
     </class-decl>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-343'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
@@ -9365,21 +9365,21 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- cpp_token* tokenrun::limit -->
-        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-332'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -9405,7 +9405,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -9573,7 +9573,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-276' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -9585,7 +9585,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -9625,14 +9625,14 @@
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-355' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -9640,30 +9640,30 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-178' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-321'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
@@ -9676,20 +9676,20 @@
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-325'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -9707,7 +9707,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
@@ -9715,15 +9715,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-325' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-327' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
@@ -9734,9 +9734,9 @@
       </data-member>
     </union-decl>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-361'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-361' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -9754,86 +9754,86 @@
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-327'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-338'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
@@ -9856,7 +9856,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-351' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -9884,7 +9884,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -9920,24 +9920,24 @@
     <!-- typedef cpp_reader cpp_reader -->
     <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
+    <typedef-decl name='cpp_string' type-id='type-id-176' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-316'/>
     <!-- typedef cpp_dir cpp_dir -->
     <typedef-decl name='cpp_dir' type-id='type-id-288' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-421'/>
     <!-- typedef ht_identifier* hashnode -->
     <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
+    <typedef-decl name='hash_table' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-333'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-334'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -9953,7 +9953,7 @@
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-276'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -9985,7 +9985,7 @@
     <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -10010,7 +10010,7 @@
       </data-member>
     </class-decl>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-340'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
         <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
@@ -10100,25 +10100,25 @@
     <!-- _cpp_file* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-351'/>
     <!-- _cpp_strbuf* -->
     <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-427'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-320'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-318'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-328'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
+    <qualified-type-def type-id='type-id-357' const='yes' id='type-id-336'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-291'/>
     <!-- const cpp_macro -->
     <qualified-type-def type-id='type-id-155' const='yes' id='type-id-428'/>
     <!-- const cpp_macro* -->
@@ -10128,15 +10128,15 @@
     <!-- const cpp_string* -->
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-261'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-269'/>
     <!-- const cpp_token* -->
     <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-263'/>
     <!-- const cpp_token** -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-337'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-286'/>
     <!-- const time_t -->
     <qualified-type-def type-id='type-id-422' const='yes' id='type-id-430'/>
     <!-- const time_t* -->
@@ -10150,9 +10150,9 @@
     <!-- const uchar* -->
     <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-256'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-281'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-356'/>
     <!-- cpp_context* -->
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
     <!-- cpp_dir* -->
@@ -10160,35 +10160,35 @@
     <!-- cpp_dir** -->
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-434'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-317'/>
     <!-- cpp_reader* -->
     <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-258'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-302'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-304'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-295'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-290'/>
     <!-- hash_table* -->
     <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-353'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-298'/>
     <!-- ht_identifier* -->
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-352'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-314'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-326'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-299'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-296'/>
     <!-- time_t* -->
     <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-435'/>
     <!-- tm* -->
@@ -10196,29 +10196,29 @@
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-354'/>
     <!-- uchar* -->
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-319'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-309'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-307'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-308'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-313'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-312'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-310'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-311'/>
     <!-- int _cpp_warn_if_unused_macro(cpp_reader*, cpp_hashnode*, void*) -->
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -10389,7 +10389,7 @@
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-258'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-164'/>
+      <return type-id='type-id-163'/>
     </function-decl>
     <!-- void _cpp_extend_buff(cpp_reader*, _cpp_buff**, size_t) -->
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
@@ -10407,7 +10407,7 @@
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-258'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-164'/>
+      <return type-id='type-id-163'/>
     </function-decl>
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10576,6 +10576,8 @@
       <!-- unsigned char* -->
       <return type-id='type-id-280'/>
     </function-decl>
+    <!-- struct _cpp_strbuf -->
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <!-- bool (cpp_reader*, cpp_hashnode*) -->
     <function-type size-in-bits='64' id='type-id-348'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -10638,7 +10640,7 @@
       <return type-id='type-id-15'/>
     </function-type>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*) -->
-    <function-type size-in-bits='64' id='type-id-353'>
+    <function-type size-in-bits='64' id='type-id-359'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const cpp_token*' -->
@@ -10647,7 +10649,7 @@
       <return type-id='type-id-116'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-354'>
+    <function-type size-in-bits='64' id='type-id-360'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-258'/>
       <!-- parameter of type 'const char*' -->
@@ -10761,12 +10763,10 @@
       <!-- void -->
       <return type-id='type-id-31'/>
     </function-type>
-    <!-- struct _cpp_strbuf -->
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- const deps -->
-    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-437'/>
+    <qualified-type-def type-id='type-id-341' const='yes' id='type-id-437'/>
     <!-- const deps* -->
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-438'/>
     <!-- deps* deps_init() -->
@@ -10930,7 +10930,7 @@
       <!-- parameter of type 'hash_table*' -->
       <parameter type-id='type-id-412' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'hashnode*' -->
-      <parameter type-id='type-id-358' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-353' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-13' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -12380,66 +12380,66 @@
       </data-member>
     </class-decl>
     <!-- struct pex_funcs -->
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
-        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
-        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
-        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int (pex_obj*, int)* pex_funcs::close -->
-        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
-        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
-        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
-        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
-        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- void (pex_obj*)* pex_funcs::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
     <!-- FILE* (pex_obj*, int, int)* -->
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-170'/>
     <!-- const pex_funcs -->
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
+    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-153'/>
     <!-- const pex_funcs* -->
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
     <!-- int (pex_obj*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-165'/>
     <!-- int (pex_obj*, int)* -->
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-167'/>
     <!-- int (pex_obj*, int*, int)* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-169'/>
     <!-- pex_time* -->
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
     <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-166'/>
     <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-168'/>
     <!-- void (pex_obj*)* -->
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-171'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <!-- parameter of type 'int' -->
@@ -12526,7 +12526,7 @@
       <return type-id='type-id-89'/>
     </function-type>
     <!-- int (pex_obj*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-174'>
+    <function-type size-in-bits='64' id='type-id-179'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'const char*' -->
@@ -12537,7 +12537,7 @@
       <return type-id='type-id-18'/>
     </function-type>
     <!-- int (pex_obj*, int) -->
-    <function-type size-in-bits='64' id='type-id-175'>
+    <function-type size-in-bits='64' id='type-id-180'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int' -->
@@ -12546,7 +12546,7 @@
       <return type-id='type-id-18'/>
     </function-type>
     <!-- int (pex_obj*, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-176'>
+    <function-type size-in-bits='64' id='type-id-181'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-131'/>
       <!-- parameter of type 'int*' -->
@@ -12577,7 +12577,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-338'/>
+      <parameter type-id='type-id-328'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42'/>
       <!-- typedef pid_t -->
@@ -12596,7 +12596,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-18'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-338'/>
+      <parameter type-id='type-id-328'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-42'/>
       <!-- typedef pid_t -->
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index 8e8178a9..09cbd1ee 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -3495,6 +3495,10 @@
     <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
     <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-289'/>
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-30' visibility='default' is-declaration-only='yes' id='type-id-32'/>
+    <class-decl name='__anonymous_struct__3' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-37' visibility='default' is-declaration-only='yes' id='type-id-36'/>
     <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-300'/>
     <reference-type-def kind='lvalue' type-id='type-id-312' size-in-bits='64' id='type-id-290'/>
     <qualified-type-def type-id='type-id-284' const='yes' id='type-id-288'/>
@@ -3507,10 +3511,6 @@
     <function-type size-in-bits='64' id='type-id-243'>
       <return type-id='type-id-19'/>
     </function-type>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-30' visibility='default' is-declaration-only='yes' id='type-id-32'/>
-    <class-decl name='__anonymous_struct__3' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-37' visibility='default' is-declaration-only='yes' id='type-id-36'/>
     <qualified-type-def type-id='type-id-298' const='yes' id='type-id-311'/>
     <qualified-type-def type-id='type-id-282' const='yes' id='type-id-312'/>
     <qualified-type-def type-id='type-id-291' const='yes' id='type-id-313'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index d1e2e607..f43646ab 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -2421,6 +2421,11 @@
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-92'/>
       </namespace-decl>
     </namespace-decl>
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-120'/>
+    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-104'/>
+    <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-29' visibility='default' is-declaration-only='yes' id='type-id-28'/>
+    <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-38' visibility='default' is-declaration-only='yes' id='type-id-37'/>
+    <class-decl name='__anonymous_struct__6' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-41' visibility='default' is-declaration-only='yes' id='type-id-43'/>
     <reference-type-def kind='lvalue' type-id='type-id-99' size-in-bits='64' id='type-id-168'/>
     <reference-type-def kind='lvalue' type-id='type-id-183' size-in-bits='64' id='type-id-167'/>
     <function-type size-in-bits='64' id='type-id-118'>
@@ -2433,11 +2438,6 @@
     </function-type>
     <reference-type-def kind='rvalue' type-id='type-id-98' size-in-bits='64' id='type-id-169'/>
     <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-166'/>
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-120'/>
-    <class-decl name='tm' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-104'/>
-    <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-29' visibility='default' is-declaration-only='yes' id='type-id-28'/>
-    <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-38' visibility='default' is-declaration-only='yes' id='type-id-37'/>
-    <class-decl name='__anonymous_struct__6' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-41' visibility='default' is-declaration-only='yes' id='type-id-43'/>
     <qualified-type-def type-id='type-id-179' const='yes' id='type-id-183'/>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/ftdc/collector.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index ed68bf68..33de7221 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -10730,6 +10730,12 @@
       <parameter type-id='type-id-383'/>
       <return type-id='type-id-150'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1378'>
+      <parameter type-id='type-id-383'/>
+      <parameter type-id='type-id-581'/>
+      <parameter type-id='type-id-1418'/>
+      <return type-id='type-id-150'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1379'>
       <parameter type-id='type-id-383'/>
       <parameter type-id='type-id-150'/>
@@ -10776,12 +10782,6 @@
       <parameter type-id='type-id-1420'/>
       <return type-id='type-id-150'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1378'>
-      <parameter type-id='type-id-383'/>
-      <parameter type-id='type-id-581'/>
-      <parameter type-id='type-id-1418'/>
-      <return type-id='type-id-150'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-1387'>
       <parameter type-id='type-id-383'/>
       <parameter type-id='type-id-210'/>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index 75280788..c2f33be8 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -161,7 +161,6 @@
     <typedef-decl name='__off_t' type-id='type-id-20' filepath='/usr/include/bits/types.h' line='152' column='1' id='type-id-18'/>
     <typedef-decl name='cache_elem' type-id='type-id-21' filepath='./gdbmdefs.h' line='166' column='1' id='type-id-15'/>
     <typedef-decl name='hash_bucket' type-id='type-id-22' filepath='./gdbmdefs.h' line='137' column='1' id='type-id-16'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-20'/>
     <class-decl name='gdbm_file_info' size-in-bits='1344' is-struct='yes' visibility='default' filepath='./gdbmdefs.h' line='172' column='1' id='type-id-19'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-23' visibility='default' filepath='./gdbmdefs.h' line='177' column='1'/>
@@ -291,6 +290,7 @@
         <var-decl name='h_table' type-id='type-id-34' visibility='default' filepath='./gdbmdefs.h' line='136' column='1'/>
       </data-member>
     </class-decl>
+    <type-decl name='long int' size-in-bits='64' id='type-id-20'/>
     <array-type-def dimensions='1' type-id='type-id-35' size-in-bits='768' id='type-id-33'>
       <subrange length='6' type-id='type-id-36' id='type-id-37'/>
     </array-type-def>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 8ef29eea..34d22e9c 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1039,13 +1039,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='a3cec311' size-in-bits='32' id='157d4f95'/>
-    <reference-type-def kind='lvalue' type-id='34433e18' size-in-bits='32' id='83dafb9a'/>
-    <reference-type-def kind='lvalue' type-id='0a81a029' size-in-bits='32' id='990ef79d'/>
-    <reference-type-def kind='lvalue' type-id='2d59b88e' size-in-bits='32' id='0c3db078'/>
-    <qualified-type-def type-id='c894953d' const='yes' id='4ab96a04'/>
-    <qualified-type-def type-id='3ff5601b' const='yes' id='922df12b'/>
-    <pointer-type-def type-id='3ff5601b' size-in-bits='32' id='4aafb922'/>
     <namespace-decl name='android'>
       <class-decl name='String16' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/String16.h' line='39' column='1' id='c73fabea'>
         <member-type access='private'>
@@ -1073,6 +1066,13 @@
         </member-type>
       </class-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='a3cec311' size-in-bits='32' id='157d4f95'/>
+    <reference-type-def kind='lvalue' type-id='34433e18' size-in-bits='32' id='83dafb9a'/>
+    <reference-type-def kind='lvalue' type-id='0a81a029' size-in-bits='32' id='990ef79d'/>
+    <reference-type-def kind='lvalue' type-id='2d59b88e' size-in-bits='32' id='0c3db078'/>
+    <qualified-type-def type-id='c894953d' const='yes' id='4ab96a04'/>
+    <qualified-type-def type-id='3ff5601b' const='yes' id='922df12b'/>
+    <pointer-type-def type-id='3ff5601b' size-in-bits='32' id='4aafb922'/>
     <typedef-decl name='int32_t' type-id='33f57a65' filepath='bionic/libc/include/stdint.h' line='64' column='1' id='3ff5601b'/>
     <type-decl name='void' id='48b5725f'/>
     <namespace-decl name='android'>
@@ -1806,15 +1806,6 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <qualified-type-def type-id='f7c5ae1e' const='yes' id='79f4741d'/>
-    <qualified-type-def type-id='65c10d3d' const='yes' id='dda33994'/>
-    <qualified-type-def type-id='cb49a619' const='yes' id='4eb937a6'/>
-    <reference-type-def kind='lvalue' type-id='b04de3ca' size-in-bits='32' id='769dcc84'/>
-    <pointer-type-def type-id='b04de3ca' size-in-bits='32' id='6a9db9a0'/>
-    <qualified-type-def type-id='a846fc93' const='yes' id='eb5b5ff2'/>
-    <qualified-type-def type-id='b96825af' const='yes' id='2b61797f'/>
-    <reference-type-def kind='rvalue' type-id='c722890a' size-in-bits='32' id='4c21e37e'/>
-    <pointer-type-def type-id='c722890a' size-in-bits='32' id='d3ba3bb8'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='default_delete&lt;android::IObbActionListener&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2320' column='1' id='0de0b2fb'>
@@ -1827,6 +1818,15 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='f7c5ae1e' const='yes' id='79f4741d'/>
+    <qualified-type-def type-id='65c10d3d' const='yes' id='dda33994'/>
+    <qualified-type-def type-id='cb49a619' const='yes' id='4eb937a6'/>
+    <reference-type-def kind='lvalue' type-id='b04de3ca' size-in-bits='32' id='769dcc84'/>
+    <pointer-type-def type-id='b04de3ca' size-in-bits='32' id='6a9db9a0'/>
+    <qualified-type-def type-id='a846fc93' const='yes' id='eb5b5ff2'/>
+    <qualified-type-def type-id='b96825af' const='yes' id='2b61797f'/>
+    <reference-type-def kind='rvalue' type-id='c722890a' size-in-bits='32' id='4c21e37e'/>
+    <pointer-type-def type-id='c722890a' size-in-bits='32' id='d3ba3bb8'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__pointer_type&lt;android::IObbActionListener, std::__1::default_delete&lt;android::IObbActionListener&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='4ef6f3a4'>
@@ -1838,9 +1838,6 @@
     </namespace-decl>
     <pointer-type-def type-id='9af0438f' size-in-bits='32' id='ed491f06'/>
     <type-decl name='char32_t' size-in-bits='32' id='a846fc93'/>
-    <reference-type-def kind='lvalue' type-id='4eb937a6' size-in-bits='32' id='6d925e80'/>
-    <qualified-type-def type-id='f8f7e309' const='yes' id='b04de3ca'/>
-    <pointer-type-def type-id='0de0b2fb' size-in-bits='32' id='b83a824b'/>
     <class-decl name='ObbActionListener' size-in-bits='224' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='36' column='1' id='38e516d0'>
       <base-class access='public' layout-offset-in-bits='0' type-id='b4c0d64f'/>
       <data-member access='private' layout-offset-in-bits='128'>
@@ -1903,6 +1900,9 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='4eb937a6' size-in-bits='32' id='6d925e80'/>
+    <qualified-type-def type-id='f8f7e309' const='yes' id='b04de3ca'/>
+    <pointer-type-def type-id='0de0b2fb' size-in-bits='32' id='b83a824b'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <namespace-decl name='__pointer_type_imp'>
@@ -2017,6 +2017,30 @@
     <typedef-decl name='AStorageManager' type-id='56516754' filepath='frameworks/native/include/android/storage_manager.h' line='40' column='1' id='6fc023b3'/>
     <type-decl name='unsigned char' size-in-bits='8' id='002ac4a6'/>
     <pointer-type-def type-id='2144ef38' size-in-bits='32' id='3ab04eee'/>
+    <class-decl name='AStorageManager' size-in-bits='352' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='62' column='1' id='56516754'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='12f619c0'/>
+      <data-member access='protected' layout-offset-in-bits='64'>
+        <var-decl name='mCallbackLock' type-id='406f4753' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='64' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='96'>
+        <var-decl name='mCallbacks' type-id='3847ab67' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='65' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='256'>
+        <var-decl name='mNextNonce' type-id='fda05812' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='66' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='288'>
+        <var-decl name='mObbActionListener' type-id='788ba3f2' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='67' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='320'>
+        <var-decl name='mMountService' type-id='f331f373' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='68' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='AStorageManager' mangled-name='_ZN15AStorageManagerC2Ev' filepath='frameworks/base/native/android/storage_manager.cpp' line='98' column='1' visibility='default' binding='global' size-in-bits='32'>
+          <parameter type-id='df7f8372' is-artificial='yes'/>
+          <return type-id='48b5725f'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
     <namespace-decl name='android'>
       <class-decl name='BBinder' visibility='default' is-declaration-only='yes' id='a4d376c6'/>
     </namespace-decl>
@@ -2090,30 +2114,6 @@
     </namespace-decl>
     <pointer-type-def type-id='f7007f3f' size-in-bits='32' id='eac80e0f'/>
     <qualified-type-def type-id='4c8890e6' const='yes' id='f4bc7ed7'/>
-    <class-decl name='AStorageManager' size-in-bits='352' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='62' column='1' id='56516754'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='12f619c0'/>
-      <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='mCallbackLock' type-id='406f4753' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='64' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='96'>
-        <var-decl name='mCallbacks' type-id='3847ab67' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='65' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='256'>
-        <var-decl name='mNextNonce' type-id='fda05812' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='66' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='288'>
-        <var-decl name='mObbActionListener' type-id='788ba3f2' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='67' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='320'>
-        <var-decl name='mMountService' type-id='f331f373' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='68' column='1'/>
-      </data-member>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='AStorageManager' mangled-name='_ZN15AStorageManagerC2Ev' filepath='frameworks/base/native/android/storage_manager.cpp' line='98' column='1' visibility='default' binding='global' size-in-bits='32'>
-          <parameter type-id='df7f8372' is-artificial='yes'/>
-          <return type-id='48b5725f'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
     <pointer-type-def type-id='40b6343a' size-in-bits='32' id='6d5a3b78'/>
     <reference-type-def kind='rvalue' type-id='12dbd264' size-in-bits='32' id='de3da448'/>
     <pointer-type-def type-id='12dbd264' size-in-bits='32' id='eed59172'/>
@@ -2368,16 +2368,16 @@
     <typedef-decl name='pthread_mutex_t' type-id='cc3d65c7' filepath='bionic/libc/include/bits/pthread_types.h' line='78' column='1' id='7a6844eb'/>
     <pointer-type-def type-id='f0b1600d' size-in-bits='32' id='547a22ad'/>
     <qualified-type-def type-id='547a22ad' const='yes' id='b8e35a82'/>
-    <qualified-type-def type-id='406f4753' const='yes' id='a3f5ae0e'/>
-    <qualified-type-def type-id='fd376fcf' const='yes' id='2e96e5aa'/>
-    <qualified-type-def type-id='5d81b3b0' const='yes' id='94d46bf9'/>
-    <qualified-type-def type-id='3847ab67' const='yes' id='27297916'/>
-    <qualified-type-def type-id='f331f373' const='yes' id='62294afc'/>
     <class-decl name='__anonymous_struct__4' size-in-bits='32' is-struct='yes' is-anonymous='yes' naming-typedef-id='7a6844eb' visibility='default' filepath='bionic/libc/include/bits/pthread_types.h' line='72' column='1' id='cc3d65c7'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__private' type-id='e4652d73' visibility='default' filepath='bionic/libc/include/bits/pthread_types.h' line='76' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='406f4753' const='yes' id='a3f5ae0e'/>
+    <qualified-type-def type-id='fd376fcf' const='yes' id='2e96e5aa'/>
+    <qualified-type-def type-id='5d81b3b0' const='yes' id='94d46bf9'/>
+    <qualified-type-def type-id='3847ab67' const='yes' id='27297916'/>
+    <qualified-type-def type-id='f331f373' const='yes' id='62294afc'/>
     <class-decl name='ObbCallback' size-in-bits='96' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='49' column='1' id='f0b1600d'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='nonce' type-id='3ff5601b' visibility='default' filepath='frameworks/base/native/android/storage_manager.cpp' line='57' column='1'/>
@@ -15012,18 +15012,23 @@
       <parameter type-id='d6ad37ff'/>
       <return type-id='b59d7dce'/>
     </function-decl>
+    <class-decl name='_JavaVM' is-struct='yes' visibility='default' is-declaration-only='yes' id='d607eddf'/>
+    <class-decl name='__sFILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='8d7b2c1e'/>
     <class-decl name='_jbooleanArray' visibility='default' is-declaration-only='yes' id='2ca86b0d'/>
     <class-decl name='_jbyteArray' visibility='default' is-declaration-only='yes' id='1e7918a7'/>
     <class-decl name='_jcharArray' visibility='default' is-declaration-only='yes' id='eeed1f5d'/>
     <class-decl name='_jclass' visibility='default' is-declaration-only='yes' id='e53ab91c'/>
     <class-decl name='_jdoubleArray' visibility='default' is-declaration-only='yes' id='530c1a32'/>
+    <class-decl name='_jfieldID' is-struct='yes' visibility='default' is-declaration-only='yes' id='2e67d715'/>
     <class-decl name='_jfloatArray' visibility='default' is-declaration-only='yes' id='a87003ef'/>
     <class-decl name='_jintArray' visibility='default' is-declaration-only='yes' id='b0749e8e'/>
     <class-decl name='_jlongArray' visibility='default' is-declaration-only='yes' id='fb46a283'/>
+    <class-decl name='_jmethodID' is-struct='yes' visibility='default' is-declaration-only='yes' id='d988e2e8'/>
     <class-decl name='_jobjectArray' visibility='default' is-declaration-only='yes' id='fdf9f098'/>
     <class-decl name='_jshortArray' visibility='default' is-declaration-only='yes' id='30a4d497'/>
     <class-decl name='_jstring' visibility='default' is-declaration-only='yes' id='ae6a1c55'/>
     <class-decl name='_jthrowable' visibility='default' is-declaration-only='yes' id='07f10124'/>
+    <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' naming-typedef-id='b7b5d51d' visibility='default' is-declaration-only='yes' id='cdd897ad'/>
     <pointer-type-def type-id='ca7c9639' size-in-bits='32' id='d5203fe9'/>
     <reference-type-def kind='rvalue' type-id='a6c45d85' size-in-bits='32' id='0e7051ad'/>
     <function-type size-in-bits='32' id='055a6f41'>
@@ -16482,11 +16487,6 @@
     <pointer-type-def type-id='68b1ae7f' size-in-bits='32' id='302e0f27'/>
     <reference-type-def kind='rvalue' type-id='27619c1c' size-in-bits='32' id='cbb281c0'/>
     <pointer-type-def type-id='b9953957' size-in-bits='32' id='ff43352f'/>
-    <class-decl name='_JavaVM' is-struct='yes' visibility='default' is-declaration-only='yes' id='d607eddf'/>
-    <class-decl name='__sFILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='8d7b2c1e'/>
-    <class-decl name='_jfieldID' is-struct='yes' visibility='default' is-declaration-only='yes' id='2e67d715'/>
-    <class-decl name='_jmethodID' is-struct='yes' visibility='default' is-declaration-only='yes' id='d988e2e8'/>
-    <class-decl name='__anonymous_struct__3' is-struct='yes' is-anonymous='yes' naming-typedef-id='b7b5d51d' visibility='default' is-declaration-only='yes' id='cdd897ad'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__const_pointer&lt;char, char *, std::__1::allocator&lt;char&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1042' column='1' id='a6fda4d5'>
@@ -16498,7 +16498,6 @@
     </namespace-decl>
     <union-decl name='jvalue' visibility='default' is-declaration-only='yes' id='2eab072b'/>
     <pointer-type-def type-id='002ac4a6' size-in-bits='32' id='cf536864'/>
-    <qualified-type-def type-id='1eb56b1e' const='yes' id='ca7c9639'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__hash_value_type&lt;ASurfaceControl *, ASurfaceControlStats&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='external/libcxx/include/unordered_map' line='628' column='1' id='68b1ae7f'>
@@ -16583,7 +16582,41 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='1eb56b1e' const='yes' id='ca7c9639'/>
     <qualified-type-def type-id='0373e656' const='yes' id='f8a9b7c9'/>
+    <class-decl name='ASurfaceControlStats' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='196' column='1' id='5d04a8c3'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='acquireTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='197' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='previousReleaseFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='198' column='1'/>
+      </data-member>
+    </class-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='__tuple_indices&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='d0bb5fc7'/>
+      </namespace-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='__tuple_indices&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='c527ef4d'/>
+      </namespace-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='pair&lt;ASurfaceControl *&amp;&amp;, ASurfaceControlStats &amp;&amp;&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='b83aca4a'/>
+      </namespace-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='pair&lt;ASurfaceControl *&amp;, ASurfaceControlStats &amp;&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='01608bde'/>
+      </namespace-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='298' column='1' id='4582d906'/>
+      </namespace-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='tuple&lt;&gt;' size-in-bits='8' visibility='default' filepath='external/libcxx/include/tuple' line='907' column='1' id='ad3ebb8d'>
@@ -16631,39 +16664,6 @@
     <reference-type-def kind='rvalue' type-id='b9953957' size-in-bits='32' id='7fd67367'/>
     <reference-type-def kind='lvalue' type-id='ad3ebb8d' size-in-bits='32' id='57c94099'/>
     <reference-type-def kind='lvalue' type-id='3982c1f3' size-in-bits='32' id='efa5f087'/>
-    <class-decl name='ASurfaceControlStats' size-in-bits='128' is-struct='yes' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='196' column='1' id='5d04a8c3'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='acquireTime' type-id='9da381c4' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='197' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='previousReleaseFence' type-id='f783287d' visibility='default' filepath='frameworks/base/native/android/surface_control.cpp' line='198' column='1'/>
-      </data-member>
-    </class-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='__tuple_indices&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='d0bb5fc7'/>
-      </namespace-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='__tuple_indices&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/__tuple' line='90' column='1' id='c527ef4d'/>
-      </namespace-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='pair&lt;ASurfaceControl *&amp;&amp;, ASurfaceControlStats &amp;&amp;&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='b83aca4a'/>
-      </namespace-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='pair&lt;ASurfaceControl *&amp;, ASurfaceControlStats &amp;&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='01608bde'/>
-      </namespace-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/utility' line='298' column='1' id='4582d906'/>
-      </namespace-decl>
-    </namespace-decl>
     <pointer-type-def type-id='7df76490' size-in-bits='32' id='0373e656'/>
     <namespace-decl name='android'>
       <class-decl name='sp&lt;android::Fence&gt;' size-in-bits='32' visibility='default' filepath='system/core/libutils/include/utils/StrongPointer.h' line='31' column='1' id='f783287d'>
@@ -16705,12 +16705,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='68b1ae7f' const='yes' id='9be7a20a'/>
-    <qualified-type-def type-id='b9953957' const='yes' id='d7189d92'/>
-    <reference-type-def kind='lvalue' type-id='4d4a8404' size-in-bits='32' id='ce4e0186'/>
-    <pointer-type-def type-id='ad3ebb8d' size-in-bits='32' id='63c9537d'/>
-    <reference-type-def kind='rvalue' type-id='3982c1f3' size-in-bits='32' id='e339cd73'/>
-    <pointer-type-def type-id='3982c1f3' size-in-bits='32' id='e3a5dda3'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__tuple_impl&lt;std::__1::__tuple_indices&lt;0&gt;, ASurfaceControl *const &amp;&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/tuple' line='365' column='1' id='6ab6a882'>
@@ -16738,9 +16732,16 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='68b1ae7f' const='yes' id='9be7a20a'/>
+    <qualified-type-def type-id='b9953957' const='yes' id='d7189d92'/>
+    <reference-type-def kind='lvalue' type-id='4d4a8404' size-in-bits='32' id='ce4e0186'/>
+    <pointer-type-def type-id='ad3ebb8d' size-in-bits='32' id='63c9537d'/>
+    <reference-type-def kind='rvalue' type-id='3982c1f3' size-in-bits='32' id='e339cd73'/>
+    <pointer-type-def type-id='3982c1f3' size-in-bits='32' id='e3a5dda3'/>
     <pointer-type-def type-id='8e900ba9' size-in-bits='32' id='97b48b31'/>
     <reference-type-def kind='rvalue' type-id='f783287d' size-in-bits='32' id='adbbacfd'/>
     <pointer-type-def type-id='f783287d' size-in-bits='32' id='e1c103ed'/>
+    <class-decl name='ASurfaceControl' is-struct='yes' visibility='default' is-declaration-only='yes' id='7df76490'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__tuple_leaf&lt;0, ASurfaceControl *const &amp;, false&gt;' size-in-bits='32' visibility='default' filepath='external/libcxx/include/tuple' line='171' column='1' id='13e36007'>
@@ -16775,7 +16776,6 @@
     <qualified-type-def type-id='3982c1f3' const='yes' id='4d4a8404'/>
     <reference-type-def kind='rvalue' type-id='6ab6a882' size-in-bits='32' id='1ad91416'/>
     <pointer-type-def type-id='6ab6a882' size-in-bits='32' id='aa2cee90'/>
-    <class-decl name='ASurfaceControl' is-struct='yes' visibility='default' is-declaration-only='yes' id='7df76490'/>
     <reference-type-def kind='lvalue' type-id='f8a9b7c9' size-in-bits='32' id='622c8d3d'/>
     <namespace-decl name='android'>
       <class-decl name='Fence' size-in-bits='64' visibility='default' filepath='frameworks/native/libs/ui/include/ui/Fence.h' line='35' column='1' id='8e900ba9'>
@@ -16922,7 +16922,6 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <qualified-type-def type-id='8e900ba9' const='yes' id='00dc55cc'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='atomic&lt;int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/atomic' line='1084' column='1' id='673b29cf'>
@@ -16943,10 +16942,9 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='8e900ba9' const='yes' id='00dc55cc'/>
     <reference-type-def kind='rvalue' type-id='bd6f4e31' size-in-bits='32' id='5f6661f1'/>
     <pointer-type-def type-id='bd6f4e31' size-in-bits='32' id='7cdd3de9'/>
-    <reference-type-def kind='lvalue' type-id='d21a10b2' size-in-bits='32' id='530818fc'/>
-    <pointer-type-def type-id='673b29cf' size-in-bits='32' id='a287a977'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__atomic_base&lt;int, true&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/atomic' line='1003' column='1' id='a5d64365'>
@@ -16967,8 +16965,8 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <qualified-type-def type-id='bd6f4e31' const='yes' id='d21a10b2'/>
-    <pointer-type-def type-id='a5d64365' size-in-bits='32' id='dcdcfc25'/>
+    <reference-type-def kind='lvalue' type-id='d21a10b2' size-in-bits='32' id='530818fc'/>
+    <pointer-type-def type-id='673b29cf' size-in-bits='32' id='a287a977'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__atomic_base&lt;int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/atomic' line='891' column='1' id='0efd2e9e'>
@@ -17001,6 +16999,8 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='bd6f4e31' const='yes' id='d21a10b2'/>
+    <pointer-type-def type-id='a5d64365' size-in-bits='32' id='dcdcfc25'/>
     <reference-type-def kind='lvalue' type-id='96cd7851' size-in-bits='32' id='dc74a355'/>
     <pointer-type-def type-id='0efd2e9e' size-in-bits='32' id='88faef04'/>
     <qualified-type-def type-id='0efd2e9e' const='yes' id='96cd7851'/>
@@ -32973,6 +32973,18 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='__1'>
+        <class-decl name='default_delete&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2320' column='1' id='523e1257'>
+          <member-function access='public'>
+            <function-decl name='default_delete' filepath='external/libcxx/include/memory' line='2324' column='1' visibility='default' binding='global' size-in-bits='32'>
+              <parameter type-id='2e0ab16f' is-artificial='yes'/>
+              <return type-id='48b5725f'/>
+            </function-decl>
+          </member-function>
+        </class-decl>
+      </namespace-decl>
+    </namespace-decl>
     <function-type size-in-bits='32' id='f1e1c37c'>
       <parameter type-id='1a1ddb91'/>
       <parameter type-id='9f7200cf'/>
@@ -32988,18 +33000,6 @@
       <return type-id='48b5725f'/>
     </function-type>
     <reference-type-def kind='rvalue' type-id='ee11ffd6' size-in-bits='32' id='165e4caa'/>
-    <namespace-decl name='std'>
-      <namespace-decl name='__1'>
-        <class-decl name='default_delete&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2320' column='1' id='523e1257'>
-          <member-function access='public'>
-            <function-decl name='default_delete' filepath='external/libcxx/include/memory' line='2324' column='1' visibility='default' binding='global' size-in-bits='32'>
-              <parameter type-id='2e0ab16f' is-artificial='yes'/>
-              <return type-id='48b5725f'/>
-            </function-decl>
-          </member-function>
-        </class-decl>
-      </namespace-decl>
-    </namespace-decl>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__pointer_type&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt;, std::__1::default_delete&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='1029' column='1' id='302a5334'>
@@ -33012,10 +33012,6 @@
     <pointer-type-def type-id='b24794a9' size-in-bits='32' id='e9f802d1'/>
     <reference-type-def kind='rvalue' type-id='9d2f093d' size-in-bits='32' id='f43945bd'/>
     <pointer-type-def type-id='9d2f093d' size-in-bits='32' id='c15f802d'/>
-    <reference-type-def kind='lvalue' type-id='de2f4d68' size-in-bits='32' id='1276b1ca'/>
-    <pointer-type-def type-id='dc8bc990' size-in-bits='32' id='d0702546'/>
-    <reference-type-def kind='rvalue' type-id='9c8ba24a' size-in-bits='32' id='2b854586'/>
-    <pointer-type-def type-id='523e1257' size-in-bits='32' id='2e0ab16f'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <class-decl name='__compressed_pair_elem&lt;std::__1::basic_string&lt;char, std::__1::char_traits&lt;char&gt;, std::__1::allocator&lt;char&gt; &gt; *, 0, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='external/libcxx/include/memory' line='2134' column='1' id='88382077'>
@@ -33063,6 +33059,10 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='de2f4d68' size-in-bits='32' id='1276b1ca'/>
+    <pointer-type-def type-id='dc8bc990' size-in-bits='32' id='d0702546'/>
+    <reference-type-def kind='rvalue' type-id='9c8ba24a' size-in-bits='32' id='2b854586'/>
+    <pointer-type-def type-id='523e1257' size-in-bits='32' id='2e0ab16f'/>
     <namespace-decl name='std'>
       <namespace-decl name='__1'>
         <namespace-decl name='__pointer_type_imp'>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index d4c24a87..c18bb45b 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -2342,18 +2342,6 @@
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-29'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-236'/>
-    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-240'/>
-    <qualified-type-def type-id='type-id-139' id='type-id-203'/>
-    <function-type size-in-bits='64' id='type-id-167'>
-      <parameter type-id='type-id-12'/>
-      <parameter type-id='type-id-12'/>
-      <return type-id='type-id-15'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-182'>
-      <return type-id='type-id-27'/>
-    </function-type>
-    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-202'/>
     <namespace-decl name='std'>
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/cpp_type_traits.h' line='83' column='1' id='type-id-204'/>
     </namespace-decl>
@@ -2367,6 +2355,18 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-246'/>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-236'/>
+    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-240'/>
+    <qualified-type-def type-id='type-id-139' id='type-id-203'/>
+    <function-type size-in-bits='64' id='type-id-167'>
+      <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-15'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-182'>
+      <return type-id='type-id-27'/>
+    </function-type>
+    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-202'/>
     <namespace-decl name='std'>
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='99' column='1' id='type-id-246'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-205'/>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 409993e3..9558588a 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -23148,6 +23148,8 @@
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-112'/>
     </function-decl>
+    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-93'/>
+    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1548'/>
     <namespace-decl name='std'>
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2963'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3608'/>
@@ -23247,6 +23249,7 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-104' visibility='default' is-declaration-only='yes' id='type-id-103'/>
     <reference-type-def kind='lvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-2973'/>
     <reference-type-def kind='lvalue' type-id='type-id-3620' size-in-bits='64' id='type-id-2978'/>
     <function-type size-in-bits='64' id='type-id-157'>
@@ -23327,9 +23330,6 @@
     <reference-type-def kind='lvalue' type-id='type-id-2980' size-in-bits='64' id='type-id-2995'/>
     <reference-type-def kind='lvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-3013'/>
     <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-2997'/>
-    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-93'/>
-    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1548'/>
-    <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-104' visibility='default' is-declaration-only='yes' id='type-id-103'/>
     <namespace-decl name='std'>
       <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3625'>
         <member-type access='public'>
@@ -23345,31 +23345,41 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3623'>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3614'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3627'/>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3608'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3628'/>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3623'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3629'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
-            <parameter type-id='type-id-3629'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
+            <parameter type-id='type-id-3631'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <parameter type-id='type-id-3613'/>
             <return type-id='type-id-60'/>
           </function-decl>
@@ -23378,31 +23388,31 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3624'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3630'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3632'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
-            <parameter type-id='type-id-3632'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
+            <parameter type-id='type-id-3634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
-            <parameter type-id='type-id-3633'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
+            <parameter type-id='type-id-3635'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -23410,39 +23420,39 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3616'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3634'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3636'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
-            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
-            <parameter type-id='type-id-3639'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
+            <parameter type-id='type-id-3641'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
@@ -23453,38 +23463,38 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3610'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3640'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3642'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
-            <parameter type-id='type-id-3642'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3644'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
-            <parameter type-id='type-id-3643'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3645'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
@@ -23495,161 +23505,137 @@
     <qualified-type-def type-id='type-id-2963' const='yes' id='type-id-3619'/>
     <qualified-type-def type-id='type-id-2956' const='yes' id='type-id-3620'/>
     <reference-type-def kind='rvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3618'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3612'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3612'/>
     <qualified-type-def type-id='type-id-2976' const='yes' id='type-id-3621'/>
     <qualified-type-def type-id='type-id-2980' const='yes' id='type-id-3622'/>
     <reference-type-def kind='rvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-3613'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3614'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3645'/>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3608'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3646'/>
-      </class-decl>
-    </namespace-decl>
     <pointer-type-def type-id='type-id-3647' size-in-bits='64' id='type-id-3615'/>
     <reference-type-def kind='rvalue' type-id='type-id-3615' size-in-bits='64' id='type-id-3617'/>
     <pointer-type-def type-id='type-id-3648' size-in-bits='64' id='type-id-3609'/>
     <reference-type-def kind='rvalue' type-id='type-id-3609' size-in-bits='64' id='type-id-3611'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3629'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3651' size-in-bits='64' id='type-id-3638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3652' size-in-bits='64' id='type-id-3642'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3653' size-in-bits='64' id='type-id-3637'/>
-    <pointer-type-def type-id='type-id-3654' size-in-bits='64' id='type-id-3644'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3636'/>
-    <pointer-type-def type-id='type-id-3623' size-in-bits='64' id='type-id-3628'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3633'/>
-    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3631'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3639'/>
-    <pointer-type-def type-id='type-id-3616' size-in-bits='64' id='type-id-3635'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3643'/>
-    <pointer-type-def type-id='type-id-3610' size-in-bits='64' id='type-id-3641'/>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3627'>
+      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3629'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2050'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3656'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3649'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3657'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3650'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3659'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
+            <parameter type-id='type-id-3652'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3660'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
+            <parameter type-id='type-id-3653'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3661'/>
+            <parameter type-id='type-id-3654'/>
             <return type-id='type-id-429'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3630'>
+      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3632'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2050'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3662'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3655'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3663'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3656'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
-            <parameter type-id='type-id-3665'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <parameter type-id='type-id-3658'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
-            <parameter type-id='type-id-3666'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <parameter type-id='type-id-3659'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_'>
-            <parameter type-id='type-id-3667'/>
+            <parameter type-id='type-id-3660'/>
             <return type-id='type-id-1634'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3668'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3636'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3661'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-569'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3669'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3662'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
-            <parameter type-id='type-id-3671'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
+            <parameter type-id='type-id-3664'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
-            <parameter type-id='type-id-3672'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
+            <parameter type-id='type-id-3665'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
@@ -23658,56 +23644,56 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_'>
-            <parameter type-id='type-id-3673'/>
+            <parameter type-id='type-id-3666'/>
             <return type-id='type-id-1908'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_'>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3666'/>
+            <return type-id='type-id-3667'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3640'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3675'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3642'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3668'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-569'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3676'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3669'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
-            <parameter type-id='type-id-3678'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3671'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
-            <parameter type-id='type-id-3679'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3672'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
@@ -23715,27 +23701,41 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3680'/>
+            <parameter type-id='type-id-3673'/>
             <return type-id='type-id-1908'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-3680'/>
-            <return type-id='type-id-3681'/>
+            <parameter type-id='type-id-3673'/>
+            <return type-id='type-id-3674'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3645'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3627'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3646'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3628'/>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3631'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3677' size-in-bits='64' id='type-id-3640'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3678' size-in-bits='64' id='type-id-3644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3679' size-in-bits='64' id='type-id-3639'/>
+    <pointer-type-def type-id='type-id-3680' size-in-bits='64' id='type-id-3646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3681' size-in-bits='64' id='type-id-3638'/>
+    <pointer-type-def type-id='type-id-3623' size-in-bits='64' id='type-id-3630'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3635'/>
+    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3633'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3641'/>
+    <pointer-type-def type-id='type-id-3616' size-in-bits='64' id='type-id-3637'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3645'/>
+    <pointer-type-def type-id='type-id-3610' size-in-bits='64' id='type-id-3643'/>
     <namespace-decl name='mongo'>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3654'>
+        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3680'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_algorithm' type-id='type-id-3682' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
           </data-member>
@@ -23756,34 +23756,34 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ScatterGatherRunner' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-3684'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC1EPNS0_22ScatterGatherAlgorithmE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-3682'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD1Ev'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='start' mangled-name='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <parameter type-id='type-id-1235'/>
               <return type-id='type-id-386'/>
@@ -23791,7 +23791,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_signalSufficientResponsesReceived' mangled-name='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-60'/>
             </function-decl>
@@ -23799,13 +23799,13 @@
           <member-function access='private' static='yes'>
             <function-decl name='_processResponse' mangled-name='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_'>
               <parameter type-id='type-id-429'/>
-              <parameter type-id='type-id-3644'/>
+              <parameter type-id='type-id-3646'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-60'/>
             </function-decl>
@@ -23813,65 +23813,41 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3685' size-in-bits='64' id='type-id-3659'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3686' size-in-bits='64' id='type-id-3665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3687' size-in-bits='64' id='type-id-3671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3688' size-in-bits='64' id='type-id-3678'/>
-    <qualified-type-def type-id='type-id-3623' const='yes' id='type-id-3649'/>
-    <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3650'/>
-    <qualified-type-def type-id='type-id-3616' const='yes' id='type-id-3651'/>
-    <qualified-type-def type-id='type-id-3610' const='yes' id='type-id-3652'/>
-    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-3653'/>
-    <qualified-type-def type-id='type-id-3644' const='yes' id='type-id-3655'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3661'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3660'/>
-    <pointer-type-def type-id='type-id-3627' size-in-bits='64' id='type-id-3658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3667'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3666'/>
-    <pointer-type-def type-id='type-id-3630' size-in-bits='64' id='type-id-3664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3673'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3672'/>
-    <pointer-type-def type-id='type-id-3634' size-in-bits='64' id='type-id-3670'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3669' size-in-bits='64' id='type-id-3674'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3680'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3679'/>
-    <pointer-type-def type-id='type-id-3640' size-in-bits='64' id='type-id-3677'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3681'/>
     <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3656'>
+      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3649'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-429' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
-            <parameter type-id='type-id-3690'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
+            <parameter type-id='type-id-3686'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
-            <parameter type-id='type-id-3691'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
+            <parameter type-id='type-id-3687'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -23879,47 +23855,47 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_'>
-            <parameter type-id='type-id-3692'/>
+            <parameter type-id='type-id-3688'/>
             <return type-id='type-id-429'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3662'>
+      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3655'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1634' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
-            <parameter type-id='type-id-3694'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3690'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
-            <parameter type-id='type-id-3695'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3691'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -23927,50 +23903,50 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_'>
-            <parameter type-id='type-id-3696'/>
+            <parameter type-id='type-id-3692'/>
             <return type-id='type-id-1634'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3668'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3697'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3698'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3661'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3693'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3694'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3697' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3699'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3695'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3701'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3697'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3702'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3698'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
             <return type-id='type-id-60'/>
@@ -23978,230 +23954,364 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_'>
-            <parameter type-id='type-id-3703'/>
-            <return type-id='type-id-3704'/>
+            <parameter type-id='type-id-3699'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_'>
-            <parameter type-id='type-id-3703'/>
-            <return type-id='type-id-3705'/>
+            <parameter type-id='type-id-3699'/>
+            <return type-id='type-id-3701'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3675'>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3668'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2073'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3698'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3694'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3706'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3702'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3708'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3704'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3709'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3705'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_'>
-            <parameter type-id='type-id-3710'/>
-            <return type-id='type-id-3704'/>
+            <parameter type-id='type-id-3706'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-3710'/>
-            <return type-id='type-id-3711'/>
+            <parameter type-id='type-id-3706'/>
+            <return type-id='type-id-3707'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-3708' size-in-bits='64' id='type-id-3652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3709' size-in-bits='64' id='type-id-3658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3710' size-in-bits='64' id='type-id-3664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3711' size-in-bits='64' id='type-id-3671'/>
+    <qualified-type-def type-id='type-id-3623' const='yes' id='type-id-3675'/>
+    <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3676'/>
+    <qualified-type-def type-id='type-id-3616' const='yes' id='type-id-3677'/>
+    <qualified-type-def type-id='type-id-3610' const='yes' id='type-id-3678'/>
+    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-3679'/>
+    <qualified-type-def type-id='type-id-3646' const='yes' id='type-id-3681'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-3654'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-3653'/>
+    <pointer-type-def type-id='type-id-3629' size-in-bits='64' id='type-id-3651'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3660'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3659'/>
+    <pointer-type-def type-id='type-id-3632' size-in-bits='64' id='type-id-3657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3636' size-in-bits='64' id='type-id-3666'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3636' size-in-bits='64' id='type-id-3665'/>
+    <pointer-type-def type-id='type-id-3636' size-in-bits='64' id='type-id-3663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3673'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3672'/>
+    <pointer-type-def type-id='type-id-3642' size-in-bits='64' id='type-id-3670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3669' size-in-bits='64' id='type-id-3674'/>
+    <namespace-decl name='std'>
+      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3694'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='_M_head_impl' type-id='type-id-3646' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3713'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3714'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-2855'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Head_base&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_'>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3612'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' static='yes'>
+          <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_'>
+            <parameter type-id='type-id-3715'/>
+            <return type-id='type-id-3700'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3693'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2092'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3716'/>
+        <member-type access='public'>
+          <typedef-decl name='_Inherited' type-id='type-id-2092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3717'/>
+        </member-type>
+        <member-function access='public'>
+          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3719'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_'>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3720'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Tuple_impl&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_'>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3618'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' static='yes'>
+          <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_'>
+            <parameter type-id='type-id-3721'/>
+            <return type-id='type-id-3722'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' static='yes'>
+          <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_'>
+            <parameter type-id='type-id-3721'/>
+            <return type-id='type-id-3723'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3683'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3712'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3724'/>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-3713'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-3725'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-3715'/>
+          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-3727'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3717' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3716'/>
+          <typedef-decl name='iterator' type-id='type-id-3729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3728'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3719' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3718'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3731' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3730'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3721' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3720'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3733' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3732'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3723' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3722'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3735' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3734'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3724'/>
+          <typedef-decl name='reference' type-id='type-id-3737' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3736'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3727' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3726'/>
+          <typedef-decl name='const_reference' type-id='type-id-3739' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3738'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3728'/>
+          <typedef-decl name='pointer' type-id='type-id-3741' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3740'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
-            <parameter type-id='type-id-3732'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3744'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3733'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3745'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3746'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3733'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3745'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3746'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3735'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3747'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3732'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3744'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-3716'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <return type-id='type-id-3728'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-3716'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <return type-id='type-id-3728'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
-            <return type-id='type-id-3718'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
-            <return type-id='type-id-3718'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3730'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-421'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
             <parameter type-id='type-id-100'/>
             <return type-id='type-id-65'/>
@@ -24209,149 +24319,39 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3737' size-in-bits='64' id='type-id-3684'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3738' size-in-bits='64' id='type-id-3690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3739' size-in-bits='64' id='type-id-3694'/>
-    <qualified-type-def type-id='type-id-3627' const='yes' id='type-id-3685'/>
-    <qualified-type-def type-id='type-id-3630' const='yes' id='type-id-3686'/>
-    <qualified-type-def type-id='type-id-3634' const='yes' id='type-id-3687'/>
-    <qualified-type-def type-id='type-id-3640' const='yes' id='type-id-3688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3740' size-in-bits='64' id='type-id-3701'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3741' size-in-bits='64' id='type-id-3708'/>
-    <pointer-type-def type-id='type-id-3742' size-in-bits='64' id='type-id-3682'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3704'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3691'/>
-    <pointer-type-def type-id='type-id-3656' size-in-bits='64' id='type-id-3689'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3696'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3695'/>
-    <pointer-type-def type-id='type-id-3662' size-in-bits='64' id='type-id-3693'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3703'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3702'/>
-    <pointer-type-def type-id='type-id-3668' size-in-bits='64' id='type-id-3700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3699' size-in-bits='64' id='type-id-3705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3710'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3709'/>
-    <pointer-type-def type-id='type-id-3675' size-in-bits='64' id='type-id-3707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3706' size-in-bits='64' id='type-id-3711'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3698'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-3644' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3744'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3745'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-2854'/>
-            <parameter type-id='type-id-2855'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Head_base&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3612'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' static='yes'>
-          <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-3746'/>
-            <return type-id='type-id-3704'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3697'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2092'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3747'/>
-        <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3748'/>
-        </member-type>
-        <member-function access='public'>
-          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3750'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3751'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Tuple_impl&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3618'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' static='yes'>
-          <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_'>
-            <parameter type-id='type-id-3752'/>
-            <return type-id='type-id-3753'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' static='yes'>
-          <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_'>
-            <parameter type-id='type-id-3752'/>
-            <return type-id='type-id-3754'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-3749' size-in-bits='64' id='type-id-3684'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3750' size-in-bits='64' id='type-id-3686'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3751' size-in-bits='64' id='type-id-3690'/>
+    <qualified-type-def type-id='type-id-3629' const='yes' id='type-id-3708'/>
+    <qualified-type-def type-id='type-id-3632' const='yes' id='type-id-3709'/>
+    <qualified-type-def type-id='type-id-3636' const='yes' id='type-id-3710'/>
+    <qualified-type-def type-id='type-id-3642' const='yes' id='type-id-3711'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3752' size-in-bits='64' id='type-id-3697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3753' size-in-bits='64' id='type-id-3704'/>
+    <pointer-type-def type-id='type-id-3754' size-in-bits='64' id='type-id-3682'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3688'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3687'/>
+    <pointer-type-def type-id='type-id-3649' size-in-bits='64' id='type-id-3685'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3692'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3691'/>
+    <pointer-type-def type-id='type-id-3655' size-in-bits='64' id='type-id-3689'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3699'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3698'/>
+    <pointer-type-def type-id='type-id-3661' size-in-bits='64' id='type-id-3696'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3695' size-in-bits='64' id='type-id-3701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3706'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3705'/>
+    <pointer-type-def type-id='type-id-3668' size-in-bits='64' id='type-id-3703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3702' size-in-bits='64' id='type-id-3707'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3719'>
+      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3731'>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3756' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3755'/>
         </member-type>
@@ -24386,7 +24386,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3717'>
+      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3729'>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3765' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3764'/>
         </member-type>
@@ -24434,7 +24434,7 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3742'>
+        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3754'>
           <member-function access='public' vtable-offset='0'>
             <function-decl name='getRequests' mangled-name='_ZNK5mongo4repl22ScatterGatherAlgorithm11getRequestsEv' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-3774' is-artificial='yes'/>
@@ -24465,110 +24465,40 @@
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3714'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3777'/>
-        <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3778'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3779'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3780'/>
-        </member-type>
-        <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3781'>
-            <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3782'/>
-            </member-type>
-          </class-decl>
-        </member-type>
-        <member-function access='public'>
-          <function-decl name='allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
-            <parameter type-id='type-id-3784'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' destructor='yes'>
-          <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3735'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3723'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3721'/>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-3654' const='yes' id='type-id-3737'/>
-    <qualified-type-def type-id='type-id-3656' const='yes' id='type-id-3738'/>
-    <qualified-type-def type-id='type-id-3662' const='yes' id='type-id-3739'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3744'/>
-    <qualified-type-def type-id='type-id-3668' const='yes' id='type-id-3740'/>
-    <qualified-type-def type-id='type-id-3675' const='yes' id='type-id-3741'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3786' size-in-bits='64' id='type-id-3750'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3787' size-in-bits='64' id='type-id-3733'/>
-    <pointer-type-def type-id='type-id-3787' size-in-bits='64' id='type-id-3736'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3788' size-in-bits='64' id='type-id-3731'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3789' size-in-bits='64' id='type-id-3732'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3753'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3746'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3745'/>
-    <pointer-type-def type-id='type-id-3698' size-in-bits='64' id='type-id-3743'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3697' size-in-bits='64' id='type-id-3752'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3697' size-in-bits='64' id='type-id-3751'/>
-    <pointer-type-def type-id='type-id-3697' size-in-bits='64' id='type-id-3749'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3748' size-in-bits='64' id='type-id-3754'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-3734'/>
-    <pointer-type-def type-id='type-id-3683' size-in-bits='64' id='type-id-3730'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3747'>
+      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3716'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1606' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3791'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3778'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3792'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3779'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -24576,172 +24506,242 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <parameter type-id='type-id-3618'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_'>
-            <parameter type-id='type-id-3793'/>
-            <return type-id='type-id-3753'/>
+            <parameter type-id='type-id-3780'/>
+            <return type-id='type-id-3722'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3712'>
+      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3724'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3794'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3714'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3781'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3726'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
-                <parameter type-id='type-id-3796'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
+                <parameter type-id='type-id-3783'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
-                <parameter type-id='type-id-3797'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
+                <parameter type-id='type-id-3784'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3799' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3798'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3785'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3800' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3729'/>
+          <typedef-decl name='pointer' type-id='type-id-3787' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3741'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3801'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3788'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3794' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3781' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3784'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3804'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3791'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3804'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3791'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-64'/>
+            <return type-id='type-id-3741'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <return type-id='type-id-3792'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m'>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3741'/>
             <parameter type-id='type-id-64'/>
-            <return type-id='type-id-3729'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
+            <parameter type-id='type-id-3793' is-artificial='yes'/>
+            <return type-id='type-id-3783'/>
           </function-decl>
         </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3726'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3794'/>
+        <member-type access='private'>
+          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3795'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3796'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3797'/>
+        </member-type>
+        <member-type access='private'>
+          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3798'>
+            <member-type access='public'>
+              <typedef-decl name='other' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3799'/>
+            </member-type>
+          </class-decl>
+        </member-type>
         <member-function access='public'>
-          <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <return type-id='type-id-3805'/>
+          <function-decl name='allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3729'/>
-            <parameter type-id='type-id-64'/>
+          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
+            <parameter type-id='type-id-3801'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
-        <member-function access='public'>
-          <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3806' is-artificial='yes'/>
-            <return type-id='type-id-3796'/>
+        <member-function access='public' destructor='yes'>
+          <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3747'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3735'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3733'/>
+    </namespace-decl>
+    <qualified-type-def type-id='type-id-3680' const='yes' id='type-id-3749'/>
+    <qualified-type-def type-id='type-id-3649' const='yes' id='type-id-3750'/>
+    <qualified-type-def type-id='type-id-3655' const='yes' id='type-id-3751'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3802' size-in-bits='64' id='type-id-3713'/>
+    <qualified-type-def type-id='type-id-3661' const='yes' id='type-id-3752'/>
+    <qualified-type-def type-id='type-id-3668' const='yes' id='type-id-3753'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3803' size-in-bits='64' id='type-id-3719'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3804' size-in-bits='64' id='type-id-3745'/>
+    <pointer-type-def type-id='type-id-3804' size-in-bits='64' id='type-id-3748'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3805' size-in-bits='64' id='type-id-3743'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3806' size-in-bits='64' id='type-id-3744'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3715'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3714'/>
+    <pointer-type-def type-id='type-id-3694' size-in-bits='64' id='type-id-3712'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3693' size-in-bits='64' id='type-id-3721'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3693' size-in-bits='64' id='type-id-3720'/>
+    <pointer-type-def type-id='type-id-3693' size-in-bits='64' id='type-id-3718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3717' size-in-bits='64' id='type-id-3723'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-3746'/>
+    <pointer-type-def type-id='type-id-3683' size-in-bits='64' id='type-id-3742'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3807'>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3727'/>
+          <typedef-decl name='const_reference' type-id='type-id-3808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3739'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3807'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3809' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3725'/>
+          <typedef-decl name='reference' type-id='type-id-3809' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3737'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <reference-type-def kind='lvalue' type-id='type-id-3810' size-in-bits='64' id='type-id-3809'/>
-    <pointer-type-def type-id='type-id-3719' size-in-bits='64' id='type-id-3761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3717' size-in-bits='64' id='type-id-3773'/>
-    <pointer-type-def type-id='type-id-3717' size-in-bits='64' id='type-id-3770'/>
+    <pointer-type-def type-id='type-id-3731' size-in-bits='64' id='type-id-3761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3729' size-in-bits='64' id='type-id-3773'/>
+    <pointer-type-def type-id='type-id-3729' size-in-bits='64' id='type-id-3770'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3777'>
+      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3794'>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3811'/>
         </member-type>
@@ -24937,30 +24937,30 @@
     <reference-type-def kind='lvalue' type-id='type-id-3846' size-in-bits='64' id='type-id-3762'/>
     <reference-type-def kind='lvalue' type-id='type-id-3847' size-in-bits='64' id='type-id-3776'/>
     <pointer-type-def type-id='type-id-3848' size-in-bits='64' id='type-id-3774'/>
-    <qualified-type-def type-id='type-id-3698' const='yes' id='type-id-3785'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3849' size-in-bits='64' id='type-id-3791'/>
-    <qualified-type-def type-id='type-id-3697' const='yes' id='type-id-3786'/>
-    <pointer-type-def type-id='type-id-3850' size-in-bits='64' id='type-id-3806'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-3796'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3852' size-in-bits='64' id='type-id-3803'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3853' size-in-bits='64' id='type-id-3784'/>
-    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3787'/>
-    <qualified-type-def type-id='type-id-3713' const='yes' id='type-id-3788'/>
-    <qualified-type-def type-id='type-id-3715' const='yes' id='type-id-3789'/>
+    <qualified-type-def type-id='type-id-3694' const='yes' id='type-id-3802'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3849' size-in-bits='64' id='type-id-3778'/>
+    <qualified-type-def type-id='type-id-3693' const='yes' id='type-id-3803'/>
+    <pointer-type-def type-id='type-id-3850' size-in-bits='64' id='type-id-3793'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-3783'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3852' size-in-bits='64' id='type-id-3790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3853' size-in-bits='64' id='type-id-3801'/>
+    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3804'/>
+    <qualified-type-def type-id='type-id-3725' const='yes' id='type-id-3805'/>
+    <qualified-type-def type-id='type-id-3727' const='yes' id='type-id-3806'/>
     <reference-type-def kind='lvalue' type-id='type-id-3854' size-in-bits='64' id='type-id-3771'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3747' size-in-bits='64' id='type-id-3793'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3747' size-in-bits='64' id='type-id-3792'/>
-    <pointer-type-def type-id='type-id-3747' size-in-bits='64' id='type-id-3790'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3712' size-in-bits='64' id='type-id-3804'/>
-    <pointer-type-def type-id='type-id-3712' size-in-bits='64' id='type-id-3802'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3798' size-in-bits='64' id='type-id-3805'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3798' size-in-bits='64' id='type-id-3797'/>
-    <pointer-type-def type-id='type-id-3794' size-in-bits='64' id='type-id-3795'/>
-    <pointer-type-def type-id='type-id-3714' size-in-bits='64' id='type-id-3783'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3716' size-in-bits='64' id='type-id-3780'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3716' size-in-bits='64' id='type-id-3779'/>
+    <pointer-type-def type-id='type-id-3716' size-in-bits='64' id='type-id-3777'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3724' size-in-bits='64' id='type-id-3791'/>
+    <pointer-type-def type-id='type-id-3724' size-in-bits='64' id='type-id-3789'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3792'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3784'/>
+    <pointer-type-def type-id='type-id-3781' size-in-bits='64' id='type-id-3782'/>
+    <pointer-type-def type-id='type-id-3726' size-in-bits='64' id='type-id-3800'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3807'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3800'/>
+          <typedef-decl name='pointer' type-id='type-id-3855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3787'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -24969,7 +24969,7 @@
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3856'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3857' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3799'/>
+              <typedef-decl name='other' type-id='type-id-3857' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3786'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -25017,113 +25017,17 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3777' size-in-bits='64' id='type-id-3815'/>
+    <pointer-type-def type-id='type-id-3794' size-in-bits='64' id='type-id-3815'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3825'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3823'/>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3820'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3860'/>
-        <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3861'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3862'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3863'/>
-        </member-type>
-        <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3864'>
-            <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3865'/>
-            </member-type>
-          </class-decl>
-        </member-type>
-        <member-function access='public'>
-          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
-            <parameter type-id='type-id-3867'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' destructor='yes'>
-          <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3841'>
-        <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3868'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3869'/>
-        </member-type>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-3868' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-65' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='59' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3870' is-artificial='yes'/>
-            <parameter type-id='type-id-3869'/>
-            <parameter type-id='type-id-65'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3870' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3829'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3827'/>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-3810' const='yes' id='type-id-3843'/>
-    <qualified-type-def type-id='type-id-3719' const='yes' id='type-id-3844'/>
-    <qualified-type-def type-id='type-id-3717' const='yes' id='type-id-3845'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3871' size-in-bits='64' id='type-id-3816'/>
-    <pointer-type-def type-id='type-id-3871' size-in-bits='64' id='type-id-3817'/>
-    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-3846'/>
-    <qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3847'/>
-    <qualified-type-def type-id='type-id-3742' const='yes' id='type-id-3848'/>
-    <qualified-type-def type-id='type-id-3747' const='yes' id='type-id-3849'/>
-    <qualified-type-def type-id='type-id-3712' const='yes' id='type-id-3850'/>
-    <qualified-type-def type-id='type-id-3798' const='yes' id='type-id-3851'/>
-    <qualified-type-def type-id='type-id-3801' const='yes' id='type-id-3852'/>
-    <qualified-type-def type-id='type-id-3714' const='yes' id='type-id-3853'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3873' size-in-bits='64' id='type-id-3839'/>
-    <pointer-type-def type-id='type-id-3873' size-in-bits='64' id='type-id-3842'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3874' size-in-bits='64' id='type-id-3837'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3875' size-in-bits='64' id='type-id-3838'/>
-    <qualified-type-def type-id='type-id-1636' const='yes' id='type-id-3854'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3840'/>
-    <pointer-type-def type-id='type-id-3775' size-in-bits='64' id='type-id-3836'/>
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3818'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3876'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3860'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3820'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-3835' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
@@ -25136,103 +25040,103 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
-                <parameter type-id='type-id-3878'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
+                <parameter type-id='type-id-3862'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
-                <parameter type-id='type-id-3879'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
+                <parameter type-id='type-id-3863'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3881' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3880'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3864'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3882' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3835'/>
+          <typedef-decl name='pointer' type-id='type-id-3866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3835'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3883'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3867'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3876' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3860' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3879'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3886'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3870'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3886'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3870'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <return type-id='type-id-3887'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <return type-id='type-id-3871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-3835'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
@@ -25240,6 +25144,102 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3820'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3872'/>
+        <member-type access='private'>
+          <typedef-decl name='value_type' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3873'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3874'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3875'/>
+        </member-type>
+        <member-type access='private'>
+          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3876'>
+            <member-type access='public'>
+              <typedef-decl name='other' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3877'/>
+            </member-type>
+          </class-decl>
+        </member-type>
+        <member-function access='public'>
+          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
+            <parameter type-id='type-id-3879'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' destructor='yes'>
+          <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev'>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3841'>
+        <member-type access='private'>
+          <typedef-decl name='iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3880'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='const_iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3881'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='_M_array' type-id='type-id-3880' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='64'>
+          <var-decl name='_M_len' type-id='type-id-65' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='59' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3882' is-artificial='yes'/>
+            <parameter type-id='type-id-3881'/>
+            <parameter type-id='type-id-65'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-3882' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3829'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3827'/>
+    </namespace-decl>
+    <qualified-type-def type-id='type-id-3810' const='yes' id='type-id-3843'/>
+    <qualified-type-def type-id='type-id-3731' const='yes' id='type-id-3844'/>
+    <qualified-type-def type-id='type-id-3729' const='yes' id='type-id-3845'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3883' size-in-bits='64' id='type-id-3816'/>
+    <pointer-type-def type-id='type-id-3883' size-in-bits='64' id='type-id-3817'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-3846'/>
+    <qualified-type-def type-id='type-id-3884' const='yes' id='type-id-3847'/>
+    <qualified-type-def type-id='type-id-3754' const='yes' id='type-id-3848'/>
+    <qualified-type-def type-id='type-id-3716' const='yes' id='type-id-3849'/>
+    <qualified-type-def type-id='type-id-3724' const='yes' id='type-id-3850'/>
+    <qualified-type-def type-id='type-id-3785' const='yes' id='type-id-3851'/>
+    <qualified-type-def type-id='type-id-3788' const='yes' id='type-id-3852'/>
+    <qualified-type-def type-id='type-id-3726' const='yes' id='type-id-3853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3885' size-in-bits='64' id='type-id-3839'/>
+    <pointer-type-def type-id='type-id-3885' size-in-bits='64' id='type-id-3842'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3886' size-in-bits='64' id='type-id-3837'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3887' size-in-bits='64' id='type-id-3838'/>
+    <qualified-type-def type-id='type-id-1636' const='yes' id='type-id-3854'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3840'/>
+    <pointer-type-def type-id='type-id-3775' size-in-bits='64' id='type-id-3836'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3888'>
         <member-type access='public'>
@@ -25277,7 +25277,7 @@
     </namespace-decl>
     <reference-type-def kind='lvalue' type-id='type-id-3895' size-in-bits='64' id='type-id-3890'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3860'>
+      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3872'>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3896'/>
         </member-type>
@@ -25320,24 +25320,24 @@
       </class-decl>
     </namespace-decl>
     <reference-type-def kind='lvalue' type-id='type-id-3902' size-in-bits='64' id='type-id-3889'/>
-    <qualified-type-def type-id='type-id-3777' const='yes' id='type-id-3871'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3903' size-in-bits='64' id='type-id-3878'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3904' size-in-bits='64' id='type-id-3885'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3867'/>
-    <qualified-type-def type-id='type-id-3775' const='yes' id='type-id-3873'/>
-    <qualified-type-def type-id='type-id-3819' const='yes' id='type-id-3874'/>
-    <qualified-type-def type-id='type-id-3821' const='yes' id='type-id-3875'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3886'/>
-    <pointer-type-def type-id='type-id-3818' size-in-bits='64' id='type-id-3884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3887'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3879'/>
-    <pointer-type-def type-id='type-id-3876' size-in-bits='64' id='type-id-3877'/>
-    <pointer-type-def type-id='type-id-3820' size-in-bits='64' id='type-id-3866'/>
-    <pointer-type-def type-id='type-id-3841' size-in-bits='64' id='type-id-3870'/>
+    <qualified-type-def type-id='type-id-3794' const='yes' id='type-id-3883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3903' size-in-bits='64' id='type-id-3862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3904' size-in-bits='64' id='type-id-3869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3879'/>
+    <qualified-type-def type-id='type-id-3775' const='yes' id='type-id-3885'/>
+    <qualified-type-def type-id='type-id-3819' const='yes' id='type-id-3886'/>
+    <qualified-type-def type-id='type-id-3821' const='yes' id='type-id-3887'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3870'/>
+    <pointer-type-def type-id='type-id-3818' size-in-bits='64' id='type-id-3868'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3864' size-in-bits='64' id='type-id-3871'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3864' size-in-bits='64' id='type-id-3863'/>
+    <pointer-type-def type-id='type-id-3860' size-in-bits='64' id='type-id-3861'/>
+    <pointer-type-def type-id='type-id-3820' size-in-bits='64' id='type-id-3878'/>
+    <pointer-type-def type-id='type-id-3841' size-in-bits='64' id='type-id-3882'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3888'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3882'/>
+          <typedef-decl name='pointer' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3866'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -25346,7 +25346,7 @@
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3907'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3881'/>
+              <typedef-decl name='other' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3865'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -25354,35 +25354,35 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='repl'>
-        <typedef-decl name='ResponseStatus' type-id='type-id-433' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3872'/>
+        <typedef-decl name='ResponseStatus' type-id='type-id-433' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3884'/>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, mongo::executor::TaskExecutor::CallbackHandle, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3909'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3782' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3894'/>
+          <typedef-decl name='__type' type-id='type-id-3799' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3894'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3892'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3779' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3893'/>
+          <typedef-decl name='__pointer' type-id='type-id-3796' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3893'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3892'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3778' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3891'/>
+          <typedef-decl name='value_type' type-id='type-id-3795' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3891'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3860' size-in-bits='64' id='type-id-3900'/>
+    <pointer-type-def type-id='type-id-3872' size-in-bits='64' id='type-id-3900'/>
     <qualified-type-def type-id='type-id-3895' const='yes' id='type-id-3902'/>
     <reference-type-def kind='lvalue' type-id='type-id-3910' size-in-bits='64' id='type-id-3901'/>
-    <qualified-type-def type-id='type-id-3880' const='yes' id='type-id-3903'/>
-    <qualified-type-def type-id='type-id-3883' const='yes' id='type-id-3904'/>
+    <qualified-type-def type-id='type-id-3864' const='yes' id='type-id-3903'/>
+    <qualified-type-def type-id='type-id-3867' const='yes' id='type-id-3904'/>
     <qualified-type-def type-id='type-id-3820' const='yes' id='type-id-3905'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3888'>
@@ -25405,35 +25405,35 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-3860' const='yes' id='type-id-3910'/>
+    <qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3910'/>
     <namespace-decl name='std'>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt;, mongo::executor::RemoteCommandRequest, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3915'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3914'/>
+          <typedef-decl name='__type' type-id='type-id-3877' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3914'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3912'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3862' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3913'/>
+          <typedef-decl name='__pointer' type-id='type-id-3874' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3913'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3912'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3861' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3911'/>
+          <typedef-decl name='value_type' type-id='type-id-3873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3911'/>
         </member-type>
       </class-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3847'/>
+    <qualified-type-def type-id='type-id-3884' const='yes' id='type-id-3847'/>
     <reference-type-def kind='lvalue' type-id='type-id-3847' size-in-bits='64' id='type-id-3776'/>
-    <qualified-type-def type-id='type-id-3742' const='yes' id='type-id-3848'/>
+    <qualified-type-def type-id='type-id-3754' const='yes' id='type-id-3848'/>
     <pointer-type-def type-id='type-id-3848' size-in-bits='64' id='type-id-3774'/>
-    <pointer-type-def type-id='type-id-3742' size-in-bits='64' id='type-id-3682'/>
+    <pointer-type-def type-id='type-id-3754' size-in-bits='64' id='type-id-3682'/>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3775'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3818'/>
@@ -25555,7 +25555,7 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3742'>
+        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3754'>
           <member-function access='public' vtable-offset='0'>
             <function-decl name='getRequests' mangled-name='_ZNK5mongo4repl22ScatterGatherAlgorithm11getRequestsEv' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-3774' is-artificial='yes'/>
@@ -25583,140 +25583,140 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='ResponseStatus' type-id='type-id-433' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3872'/>
+        <typedef-decl name='ResponseStatus' type-id='type-id-433' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3884'/>
       </namespace-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <reference-type-def kind='lvalue' type-id='type-id-3895' size-in-bits='64' id='type-id-3890'/>
     <reference-type-def kind='lvalue' type-id='type-id-3810' size-in-bits='64' id='type-id-3809'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3719' size-in-bits='64' id='type-id-3916'/>
-    <pointer-type-def type-id='type-id-3719' size-in-bits='64' id='type-id-3761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3717' size-in-bits='64' id='type-id-3773'/>
-    <pointer-type-def type-id='type-id-3717' size-in-bits='64' id='type-id-3770'/>
-    <pointer-type-def type-id='type-id-3860' size-in-bits='64' id='type-id-3900'/>
-    <pointer-type-def type-id='type-id-3777' size-in-bits='64' id='type-id-3815'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3731' size-in-bits='64' id='type-id-3916'/>
+    <pointer-type-def type-id='type-id-3731' size-in-bits='64' id='type-id-3761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3729' size-in-bits='64' id='type-id-3773'/>
+    <pointer-type-def type-id='type-id-3729' size-in-bits='64' id='type-id-3770'/>
+    <pointer-type-def type-id='type-id-3872' size-in-bits='64' id='type-id-3900'/>
+    <pointer-type-def type-id='type-id-3794' size-in-bits='64' id='type-id-3815'/>
     <reference-type-def kind='rvalue' type-id='type-id-3917' size-in-bits='64' id='type-id-3918'/>
     <qualified-type-def type-id='type-id-3895' const='yes' id='type-id-3902'/>
     <reference-type-def kind='lvalue' type-id='type-id-3902' size-in-bits='64' id='type-id-3889'/>
     <qualified-type-def type-id='type-id-3810' const='yes' id='type-id-3843'/>
     <reference-type-def kind='lvalue' type-id='type-id-3843' size-in-bits='64' id='type-id-3808'/>
-    <qualified-type-def type-id='type-id-3719' const='yes' id='type-id-3844'/>
+    <qualified-type-def type-id='type-id-3731' const='yes' id='type-id-3844'/>
     <reference-type-def kind='lvalue' type-id='type-id-3844' size-in-bits='64' id='type-id-3919'/>
     <pointer-type-def type-id='type-id-3844' size-in-bits='64' id='type-id-3763'/>
-    <qualified-type-def type-id='type-id-3717' const='yes' id='type-id-3845'/>
+    <qualified-type-def type-id='type-id-3729' const='yes' id='type-id-3845'/>
     <reference-type-def kind='lvalue' type-id='type-id-3845' size-in-bits='64' id='type-id-3920'/>
     <pointer-type-def type-id='type-id-3845' size-in-bits='64' id='type-id-3772'/>
-    <qualified-type-def type-id='type-id-3860' const='yes' id='type-id-3910'/>
+    <qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3910'/>
     <reference-type-def kind='lvalue' type-id='type-id-3910' size-in-bits='64' id='type-id-3901'/>
     <pointer-type-def type-id='type-id-3910' size-in-bits='64' id='type-id-3921'/>
-    <qualified-type-def type-id='type-id-3777' const='yes' id='type-id-3871'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3871' size-in-bits='64' id='type-id-3816'/>
-    <pointer-type-def type-id='type-id-3871' size-in-bits='64' id='type-id-3817'/>
+    <qualified-type-def type-id='type-id-3794' const='yes' id='type-id-3883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3883' size-in-bits='64' id='type-id-3816'/>
+    <pointer-type-def type-id='type-id-3883' size-in-bits='64' id='type-id-3817'/>
     <qualified-type-def type-id='type-id-3922' const='yes' id='type-id-3923'/>
     <reference-type-def kind='lvalue' type-id='type-id-3923' size-in-bits='64' id='type-id-3924'/>
     <pointer-type-def type-id='type-id-3923' size-in-bits='64' id='type-id-3925'/>
     <qualified-type-def type-id='type-id-422' const='yes' id='type-id-3846'/>
     <reference-type-def kind='lvalue' type-id='type-id-3846' size-in-bits='64' id='type-id-3762'/>
-    <qualified-type-def type-id='type-id-3654' const='yes' id='type-id-3737'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3737' size-in-bits='64' id='type-id-3684'/>
+    <qualified-type-def type-id='type-id-3680' const='yes' id='type-id-3749'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3749' size-in-bits='64' id='type-id-3684'/>
     <qualified-type-def type-id='type-id-3926' const='yes' id='type-id-3927'/>
     <reference-type-def kind='lvalue' type-id='type-id-3927' size-in-bits='64' id='type-id-3928'/>
     <qualified-type-def type-id='type-id-2963' const='yes' id='type-id-3619'/>
     <reference-type-def kind='lvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-2973'/>
     <qualified-type-def type-id='type-id-2956' const='yes' id='type-id-3620'/>
     <reference-type-def kind='lvalue' type-id='type-id-3620' size-in-bits='64' id='type-id-2978'/>
-    <qualified-type-def type-id='type-id-3656' const='yes' id='type-id-3738'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3738' size-in-bits='64' id='type-id-3690'/>
-    <qualified-type-def type-id='type-id-3662' const='yes' id='type-id-3739'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3739' size-in-bits='64' id='type-id-3694'/>
-    <qualified-type-def type-id='type-id-3698' const='yes' id='type-id-3785'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3744'/>
-    <qualified-type-def type-id='type-id-3747' const='yes' id='type-id-3849'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3849' size-in-bits='64' id='type-id-3791'/>
+    <qualified-type-def type-id='type-id-3649' const='yes' id='type-id-3750'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3750' size-in-bits='64' id='type-id-3686'/>
+    <qualified-type-def type-id='type-id-3655' const='yes' id='type-id-3751'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3751' size-in-bits='64' id='type-id-3690'/>
+    <qualified-type-def type-id='type-id-3694' const='yes' id='type-id-3802'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3802' size-in-bits='64' id='type-id-3713'/>
+    <qualified-type-def type-id='type-id-3716' const='yes' id='type-id-3849'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3849' size-in-bits='64' id='type-id-3778'/>
     <qualified-type-def type-id='type-id-3929' const='yes' id='type-id-3930'/>
     <pointer-type-def type-id='type-id-3930' size-in-bits='64' id='type-id-3931'/>
-    <qualified-type-def type-id='type-id-3627' const='yes' id='type-id-3685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3685' size-in-bits='64' id='type-id-3659'/>
-    <qualified-type-def type-id='type-id-3657' const='yes' id='type-id-3932'/>
+    <qualified-type-def type-id='type-id-3629' const='yes' id='type-id-3708'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3708' size-in-bits='64' id='type-id-3652'/>
+    <qualified-type-def type-id='type-id-3650' const='yes' id='type-id-3932'/>
     <reference-type-def kind='lvalue' type-id='type-id-3932' size-in-bits='64' id='type-id-3933'/>
-    <qualified-type-def type-id='type-id-3630' const='yes' id='type-id-3686'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3686' size-in-bits='64' id='type-id-3665'/>
-    <qualified-type-def type-id='type-id-3663' const='yes' id='type-id-3934'/>
+    <qualified-type-def type-id='type-id-3632' const='yes' id='type-id-3709'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3709' size-in-bits='64' id='type-id-3658'/>
+    <qualified-type-def type-id='type-id-3656' const='yes' id='type-id-3934'/>
     <reference-type-def kind='lvalue' type-id='type-id-3934' size-in-bits='64' id='type-id-3935'/>
     <qualified-type-def type-id='type-id-3936' const='yes' id='type-id-3937'/>
     <reference-type-def kind='lvalue' type-id='type-id-3937' size-in-bits='64' id='type-id-3938'/>
     <qualified-type-def type-id='type-id-3939' const='yes' id='type-id-3940'/>
     <reference-type-def kind='lvalue' type-id='type-id-3940' size-in-bits='64' id='type-id-3941'/>
-    <qualified-type-def type-id='type-id-3634' const='yes' id='type-id-3687'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3687' size-in-bits='64' id='type-id-3671'/>
-    <qualified-type-def type-id='type-id-3669' const='yes' id='type-id-3942'/>
+    <qualified-type-def type-id='type-id-3636' const='yes' id='type-id-3710'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3710' size-in-bits='64' id='type-id-3664'/>
+    <qualified-type-def type-id='type-id-3662' const='yes' id='type-id-3942'/>
     <reference-type-def kind='lvalue' type-id='type-id-3942' size-in-bits='64' id='type-id-3943'/>
-    <qualified-type-def type-id='type-id-3640' const='yes' id='type-id-3688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3688' size-in-bits='64' id='type-id-3678'/>
-    <qualified-type-def type-id='type-id-3676' const='yes' id='type-id-3944'/>
+    <qualified-type-def type-id='type-id-3642' const='yes' id='type-id-3711'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3711' size-in-bits='64' id='type-id-3671'/>
+    <qualified-type-def type-id='type-id-3669' const='yes' id='type-id-3944'/>
     <reference-type-def kind='lvalue' type-id='type-id-3944' size-in-bits='64' id='type-id-3945'/>
-    <qualified-type-def type-id='type-id-3668' const='yes' id='type-id-3740'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3740' size-in-bits='64' id='type-id-3701'/>
-    <qualified-type-def type-id='type-id-3699' const='yes' id='type-id-3946'/>
+    <qualified-type-def type-id='type-id-3661' const='yes' id='type-id-3752'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3752' size-in-bits='64' id='type-id-3697'/>
+    <qualified-type-def type-id='type-id-3695' const='yes' id='type-id-3946'/>
     <reference-type-def kind='lvalue' type-id='type-id-3946' size-in-bits='64' id='type-id-3947'/>
-    <qualified-type-def type-id='type-id-3675' const='yes' id='type-id-3741'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3741' size-in-bits='64' id='type-id-3708'/>
-    <qualified-type-def type-id='type-id-3706' const='yes' id='type-id-3948'/>
+    <qualified-type-def type-id='type-id-3668' const='yes' id='type-id-3753'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3753' size-in-bits='64' id='type-id-3704'/>
+    <qualified-type-def type-id='type-id-3702' const='yes' id='type-id-3948'/>
     <reference-type-def kind='lvalue' type-id='type-id-3948' size-in-bits='64' id='type-id-3949'/>
     <qualified-type-def type-id='type-id-3950' const='yes' id='type-id-3951'/>
     <reference-type-def kind='lvalue' type-id='type-id-3951' size-in-bits='64' id='type-id-3952'/>
     <qualified-type-def type-id='type-id-3953' const='yes' id='type-id-3954'/>
     <reference-type-def kind='lvalue' type-id='type-id-3954' size-in-bits='64' id='type-id-3955'/>
-    <qualified-type-def type-id='type-id-3697' const='yes' id='type-id-3786'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3786' size-in-bits='64' id='type-id-3750'/>
-    <qualified-type-def type-id='type-id-3748' const='yes' id='type-id-3956'/>
+    <qualified-type-def type-id='type-id-3693' const='yes' id='type-id-3803'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3803' size-in-bits='64' id='type-id-3719'/>
+    <qualified-type-def type-id='type-id-3717' const='yes' id='type-id-3956'/>
     <reference-type-def kind='lvalue' type-id='type-id-3956' size-in-bits='64' id='type-id-3957'/>
     <qualified-type-def type-id='type-id-3818' const='yes' id='type-id-3958'/>
     <pointer-type-def type-id='type-id-3958' size-in-bits='64' id='type-id-3959'/>
-    <qualified-type-def type-id='type-id-3880' const='yes' id='type-id-3903'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3903' size-in-bits='64' id='type-id-3878'/>
-    <qualified-type-def type-id='type-id-3883' const='yes' id='type-id-3904'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3904' size-in-bits='64' id='type-id-3885'/>
-    <qualified-type-def type-id='type-id-3712' const='yes' id='type-id-3850'/>
-    <pointer-type-def type-id='type-id-3850' size-in-bits='64' id='type-id-3806'/>
-    <qualified-type-def type-id='type-id-3798' const='yes' id='type-id-3851'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-3796'/>
-    <qualified-type-def type-id='type-id-3801' const='yes' id='type-id-3852'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3852' size-in-bits='64' id='type-id-3803'/>
+    <qualified-type-def type-id='type-id-3864' const='yes' id='type-id-3903'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3903' size-in-bits='64' id='type-id-3862'/>
+    <qualified-type-def type-id='type-id-3867' const='yes' id='type-id-3904'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3904' size-in-bits='64' id='type-id-3869'/>
+    <qualified-type-def type-id='type-id-3724' const='yes' id='type-id-3850'/>
+    <pointer-type-def type-id='type-id-3850' size-in-bits='64' id='type-id-3793'/>
+    <qualified-type-def type-id='type-id-3785' const='yes' id='type-id-3851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-3783'/>
+    <qualified-type-def type-id='type-id-3788' const='yes' id='type-id-3852'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3852' size-in-bits='64' id='type-id-3790'/>
     <qualified-type-def type-id='type-id-3820' const='yes' id='type-id-3905'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3867'/>
-    <qualified-type-def type-id='type-id-3714' const='yes' id='type-id-3853'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3853' size-in-bits='64' id='type-id-3784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3879'/>
+    <qualified-type-def type-id='type-id-3726' const='yes' id='type-id-3853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3853' size-in-bits='64' id='type-id-3801'/>
     <qualified-type-def type-id='type-id-3841' const='yes' id='type-id-3960'/>
     <pointer-type-def type-id='type-id-3960' size-in-bits='64' id='type-id-3961'/>
     <qualified-type-def type-id='type-id-3962' const='yes' id='type-id-3963'/>
     <reference-type-def kind='lvalue' type-id='type-id-3963' size-in-bits='64' id='type-id-3964'/>
     <pointer-type-def type-id='type-id-3963' size-in-bits='64' id='type-id-3965'/>
-    <qualified-type-def type-id='type-id-3623' const='yes' id='type-id-3649'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3629'/>
-    <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3650'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3632'/>
+    <qualified-type-def type-id='type-id-3623' const='yes' id='type-id-3675'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3631'/>
+    <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3634'/>
     <qualified-type-def type-id='type-id-3966' const='yes' id='type-id-3967'/>
     <reference-type-def kind='lvalue' type-id='type-id-3967' size-in-bits='64' id='type-id-3968'/>
-    <qualified-type-def type-id='type-id-3616' const='yes' id='type-id-3651'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3651' size-in-bits='64' id='type-id-3638'/>
-    <qualified-type-def type-id='type-id-3610' const='yes' id='type-id-3652'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3652' size-in-bits='64' id='type-id-3642'/>
-    <qualified-type-def type-id='type-id-3775' const='yes' id='type-id-3873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3873' size-in-bits='64' id='type-id-3839'/>
-    <pointer-type-def type-id='type-id-3873' size-in-bits='64' id='type-id-3842'/>
-    <qualified-type-def type-id='type-id-3819' const='yes' id='type-id-3874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3874' size-in-bits='64' id='type-id-3837'/>
-    <qualified-type-def type-id='type-id-3821' const='yes' id='type-id-3875'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3875' size-in-bits='64' id='type-id-3838'/>
-    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3787'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3787' size-in-bits='64' id='type-id-3733'/>
-    <pointer-type-def type-id='type-id-3787' size-in-bits='64' id='type-id-3736'/>
-    <qualified-type-def type-id='type-id-3713' const='yes' id='type-id-3788'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3788' size-in-bits='64' id='type-id-3731'/>
-    <qualified-type-def type-id='type-id-3715' const='yes' id='type-id-3789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3789' size-in-bits='64' id='type-id-3732'/>
+    <qualified-type-def type-id='type-id-3616' const='yes' id='type-id-3677'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3677' size-in-bits='64' id='type-id-3640'/>
+    <qualified-type-def type-id='type-id-3610' const='yes' id='type-id-3678'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3678' size-in-bits='64' id='type-id-3644'/>
+    <qualified-type-def type-id='type-id-3775' const='yes' id='type-id-3885'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3885' size-in-bits='64' id='type-id-3839'/>
+    <pointer-type-def type-id='type-id-3885' size-in-bits='64' id='type-id-3842'/>
+    <qualified-type-def type-id='type-id-3819' const='yes' id='type-id-3886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3886' size-in-bits='64' id='type-id-3837'/>
+    <qualified-type-def type-id='type-id-3821' const='yes' id='type-id-3887'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3887' size-in-bits='64' id='type-id-3838'/>
+    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3804'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3804' size-in-bits='64' id='type-id-3745'/>
+    <pointer-type-def type-id='type-id-3804' size-in-bits='64' id='type-id-3748'/>
+    <qualified-type-def type-id='type-id-3725' const='yes' id='type-id-3805'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3805' size-in-bits='64' id='type-id-3743'/>
+    <qualified-type-def type-id='type-id-3727' const='yes' id='type-id-3806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3806' size-in-bits='64' id='type-id-3744'/>
     <qualified-type-def type-id='type-id-3969' const='yes' id='type-id-3970'/>
     <pointer-type-def type-id='type-id-3970' size-in-bits='64' id='type-id-3971'/>
     <qualified-type-def type-id='type-id-3972' const='yes' id='type-id-3973'/>
@@ -25725,18 +25725,18 @@
     <pointer-type-def type-id='type-id-3975' size-in-bits='64' id='type-id-3977'/>
     <reference-type-def kind='lvalue' type-id='type-id-3922' size-in-bits='64' id='type-id-3978'/>
     <pointer-type-def type-id='type-id-3922' size-in-bits='64' id='type-id-3979'/>
-    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-3653'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3653' size-in-bits='64' id='type-id-3637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3753'/>
+    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-3679'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3679' size-in-bits='64' id='type-id-3639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3722'/>
     <reference-type-def kind='rvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-3618'/>
     <qualified-type-def type-id='type-id-1636' const='yes' id='type-id-3854'/>
     <reference-type-def kind='lvalue' type-id='type-id-3854' size-in-bits='64' id='type-id-3771'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3654' size-in-bits='64' id='type-id-3980'/>
-    <pointer-type-def type-id='type-id-3654' size-in-bits='64' id='type-id-3644'/>
-    <qualified-type-def type-id='type-id-3644' const='yes' id='type-id-3655'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3636'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3704'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3680' size-in-bits='64' id='type-id-3980'/>
+    <pointer-type-def type-id='type-id-3680' size-in-bits='64' id='type-id-3646'/>
+    <qualified-type-def type-id='type-id-3646' const='yes' id='type-id-3681'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3681' size-in-bits='64' id='type-id-3638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3700'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3612'/>
     <reference-type-def kind='lvalue' type-id='type-id-3926' size-in-bits='64' id='type-id-3981'/>
     <reference-type-def kind='rvalue' type-id='type-id-3926' size-in-bits='64' id='type-id-3982'/>
     <pointer-type-def type-id='type-id-3926' size-in-bits='64' id='type-id-3983'/>
@@ -25752,78 +25752,78 @@
     <qualified-type-def type-id='type-id-2980' const='yes' id='type-id-3622'/>
     <reference-type-def kind='lvalue' type-id='type-id-3622' size-in-bits='64' id='type-id-2996'/>
     <reference-type-def kind='lvalue' type-id='type-id-2980' size-in-bits='64' id='type-id-2995'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3691'/>
-    <pointer-type-def type-id='type-id-3656' size-in-bits='64' id='type-id-3689'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3696'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3695'/>
-    <pointer-type-def type-id='type-id-3662' size-in-bits='64' id='type-id-3693'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3746'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3745'/>
-    <pointer-type-def type-id='type-id-3698' size-in-bits='64' id='type-id-3743'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3747' size-in-bits='64' id='type-id-3793'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3747' size-in-bits='64' id='type-id-3792'/>
-    <pointer-type-def type-id='type-id-3747' size-in-bits='64' id='type-id-3790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3688'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3687'/>
+    <pointer-type-def type-id='type-id-3649' size-in-bits='64' id='type-id-3685'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3692'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3691'/>
+    <pointer-type-def type-id='type-id-3655' size-in-bits='64' id='type-id-3689'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3715'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3714'/>
+    <pointer-type-def type-id='type-id-3694' size-in-bits='64' id='type-id-3712'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3716' size-in-bits='64' id='type-id-3780'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3716' size-in-bits='64' id='type-id-3779'/>
+    <pointer-type-def type-id='type-id-3716' size-in-bits='64' id='type-id-3777'/>
     <reference-type-def kind='lvalue' type-id='type-id-3929' size-in-bits='64' id='type-id-3986'/>
     <reference-type-def kind='rvalue' type-id='type-id-3929' size-in-bits='64' id='type-id-3987'/>
     <pointer-type-def type-id='type-id-3929' size-in-bits='64' id='type-id-3988'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3661'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3660'/>
-    <pointer-type-def type-id='type-id-3627' size-in-bits='64' id='type-id-3658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3657' size-in-bits='64' id='type-id-3989'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3667'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3666'/>
-    <pointer-type-def type-id='type-id-3630' size-in-bits='64' id='type-id-3664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3663' size-in-bits='64' id='type-id-3990'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-3654'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-3653'/>
+    <pointer-type-def type-id='type-id-3629' size-in-bits='64' id='type-id-3651'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3989'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3660'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3659'/>
+    <pointer-type-def type-id='type-id-3632' size-in-bits='64' id='type-id-3657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3990'/>
     <reference-type-def kind='lvalue' type-id='type-id-3936' size-in-bits='64' id='type-id-3991'/>
     <reference-type-def kind='rvalue' type-id='type-id-3936' size-in-bits='64' id='type-id-3992'/>
     <pointer-type-def type-id='type-id-3936' size-in-bits='64' id='type-id-3993'/>
     <reference-type-def kind='lvalue' type-id='type-id-3939' size-in-bits='64' id='type-id-3994'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3673'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3672'/>
-    <pointer-type-def type-id='type-id-3634' size-in-bits='64' id='type-id-3670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3636' size-in-bits='64' id='type-id-3666'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3636' size-in-bits='64' id='type-id-3665'/>
+    <pointer-type-def type-id='type-id-3636' size-in-bits='64' id='type-id-3663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3673'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3672'/>
+    <pointer-type-def type-id='type-id-3642' size-in-bits='64' id='type-id-3670'/>
     <reference-type-def kind='lvalue' type-id='type-id-3669' size-in-bits='64' id='type-id-3674'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3680'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3679'/>
-    <pointer-type-def type-id='type-id-3640' size-in-bits='64' id='type-id-3677'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3681'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3703'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3702'/>
-    <pointer-type-def type-id='type-id-3668' size-in-bits='64' id='type-id-3700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3699' size-in-bits='64' id='type-id-3705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3710'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3709'/>
-    <pointer-type-def type-id='type-id-3675' size-in-bits='64' id='type-id-3707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3706' size-in-bits='64' id='type-id-3711'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3699'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3698'/>
+    <pointer-type-def type-id='type-id-3661' size-in-bits='64' id='type-id-3696'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3695' size-in-bits='64' id='type-id-3701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3706'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3705'/>
+    <pointer-type-def type-id='type-id-3668' size-in-bits='64' id='type-id-3703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3702' size-in-bits='64' id='type-id-3707'/>
     <reference-type-def kind='lvalue' type-id='type-id-3950' size-in-bits='64' id='type-id-3995'/>
     <reference-type-def kind='rvalue' type-id='type-id-3950' size-in-bits='64' id='type-id-3996'/>
     <pointer-type-def type-id='type-id-3950' size-in-bits='64' id='type-id-3997'/>
     <reference-type-def kind='lvalue' type-id='type-id-3953' size-in-bits='64' id='type-id-3998'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3697' size-in-bits='64' id='type-id-3752'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3697' size-in-bits='64' id='type-id-3751'/>
-    <pointer-type-def type-id='type-id-3697' size-in-bits='64' id='type-id-3749'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3748' size-in-bits='64' id='type-id-3754'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3886'/>
-    <pointer-type-def type-id='type-id-3818' size-in-bits='64' id='type-id-3884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3887'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3879'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3876' size-in-bits='64' id='type-id-3999'/>
-    <pointer-type-def type-id='type-id-3876' size-in-bits='64' id='type-id-3877'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3712' size-in-bits='64' id='type-id-3804'/>
-    <pointer-type-def type-id='type-id-3712' size-in-bits='64' id='type-id-3802'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3798' size-in-bits='64' id='type-id-3805'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3798' size-in-bits='64' id='type-id-3797'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3794' size-in-bits='64' id='type-id-4000'/>
-    <pointer-type-def type-id='type-id-3794' size-in-bits='64' id='type-id-3795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3693' size-in-bits='64' id='type-id-3721'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3693' size-in-bits='64' id='type-id-3720'/>
+    <pointer-type-def type-id='type-id-3693' size-in-bits='64' id='type-id-3718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3717' size-in-bits='64' id='type-id-3723'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3870'/>
+    <pointer-type-def type-id='type-id-3818' size-in-bits='64' id='type-id-3868'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3864' size-in-bits='64' id='type-id-3871'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3864' size-in-bits='64' id='type-id-3863'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3860' size-in-bits='64' id='type-id-3999'/>
+    <pointer-type-def type-id='type-id-3860' size-in-bits='64' id='type-id-3861'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3724' size-in-bits='64' id='type-id-3791'/>
+    <pointer-type-def type-id='type-id-3724' size-in-bits='64' id='type-id-3789'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3792'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3781' size-in-bits='64' id='type-id-4000'/>
+    <pointer-type-def type-id='type-id-3781' size-in-bits='64' id='type-id-3782'/>
     <reference-type-def kind='lvalue' type-id='type-id-4001' size-in-bits='64' id='type-id-4002'/>
     <reference-type-def kind='lvalue' type-id='type-id-4003' size-in-bits='64' id='type-id-4004'/>
     <reference-type-def kind='lvalue' type-id='type-id-3820' size-in-bits='64' id='type-id-4005'/>
-    <pointer-type-def type-id='type-id-3820' size-in-bits='64' id='type-id-3866'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3714' size-in-bits='64' id='type-id-4006'/>
-    <pointer-type-def type-id='type-id-3714' size-in-bits='64' id='type-id-3783'/>
+    <pointer-type-def type-id='type-id-3820' size-in-bits='64' id='type-id-3878'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3726' size-in-bits='64' id='type-id-4006'/>
+    <pointer-type-def type-id='type-id-3726' size-in-bits='64' id='type-id-3800'/>
     <pointer-type-def type-id='type-id-3911' size-in-bits='64' id='type-id-4007'/>
     <pointer-type-def type-id='type-id-3891' size-in-bits='64' id='type-id-4008'/>
-    <pointer-type-def type-id='type-id-3841' size-in-bits='64' id='type-id-3870'/>
+    <pointer-type-def type-id='type-id-3841' size-in-bits='64' id='type-id-3882'/>
     <reference-type-def kind='lvalue' type-id='type-id-3962' size-in-bits='64' id='type-id-4009'/>
     <pointer-type-def type-id='type-id-3962' size-in-bits='64' id='type-id-4010'/>
     <reference-type-def kind='rvalue' type-id='type-id-4011' size-in-bits='64' id='type-id-4012'/>
@@ -25848,27 +25848,27 @@
     <reference-type-def kind='lvalue' type-id='type-id-4049' size-in-bits='64' id='type-id-4050'/>
     <reference-type-def kind='lvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-3013'/>
     <reference-type-def kind='rvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-3613'/>
-    <pointer-type-def type-id='type-id-3623' size-in-bits='64' id='type-id-3628'/>
+    <pointer-type-def type-id='type-id-3623' size-in-bits='64' id='type-id-3630'/>
     <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-2997'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3633'/>
-    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3631'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3635'/>
+    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3633'/>
     <reference-type-def kind='lvalue' type-id='type-id-3966' size-in-bits='64' id='type-id-4051'/>
     <reference-type-def kind='rvalue' type-id='type-id-3966' size-in-bits='64' id='type-id-4052'/>
     <pointer-type-def type-id='type-id-3966' size-in-bits='64' id='type-id-4053'/>
     <reference-type-def kind='lvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-4054'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3639'/>
-    <pointer-type-def type-id='type-id-3616' size-in-bits='64' id='type-id-3635'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3641'/>
+    <pointer-type-def type-id='type-id-3616' size-in-bits='64' id='type-id-3637'/>
     <reference-type-def kind='lvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-4055'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3643'/>
-    <pointer-type-def type-id='type-id-3610' size-in-bits='64' id='type-id-3641'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3645'/>
+    <pointer-type-def type-id='type-id-3610' size-in-bits='64' id='type-id-3643'/>
     <reference-type-def kind='lvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-4056'/>
     <reference-type-def kind='rvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3840'/>
     <pointer-type-def type-id='type-id-3775' size-in-bits='64' id='type-id-3836'/>
     <reference-type-def kind='rvalue' type-id='type-id-3821' size-in-bits='64' id='type-id-4057'/>
     <reference-type-def kind='lvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-4058'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-3734'/>
-    <pointer-type-def type-id='type-id-3683' size-in-bits='64' id='type-id-3730'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3715' size-in-bits='64' id='type-id-4059'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-3746'/>
+    <pointer-type-def type-id='type-id-3683' size-in-bits='64' id='type-id-3742'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3727' size-in-bits='64' id='type-id-4059'/>
     <reference-type-def kind='lvalue' type-id='type-id-3647' size-in-bits='64' id='type-id-4060'/>
     <pointer-type-def type-id='type-id-3647' size-in-bits='64' id='type-id-3615'/>
     <qualified-type-def type-id='type-id-3615' const='yes' id='type-id-4061'/>
@@ -25937,165 +25937,165 @@
         </member-function>
       </class-decl>
       <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3614'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3645'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3627'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3645'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3627'/>
       <class-decl name='vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3683'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3712'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3724'/>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-3713'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='238' column='1' id='type-id-3725'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-3715'/>
+          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-3727'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3717' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3716'/>
+          <typedef-decl name='iterator' type-id='type-id-3729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3728'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3719' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3718'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3731' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3730'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3721' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3720'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3733' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3732'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3723' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3722'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3735' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3734'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3724'/>
+          <typedef-decl name='reference' type-id='type-id-3737' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3736'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3727' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3726'/>
+          <typedef-decl name='const_reference' type-id='type-id-3739' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3738'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3728'/>
+          <typedef-decl name='pointer' type-id='type-id-3741' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3740'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
-            <parameter type-id='type-id-3732'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3744'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3733'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3745'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3746'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3733'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3745'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3746'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3735'/>
-            <parameter type-id='type-id-3731'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3747'/>
+            <parameter type-id='type-id-3743'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3732'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <parameter type-id='type-id-3744'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-3716'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <return type-id='type-id-3728'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-3716'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
+            <return type-id='type-id-3728'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
-            <return type-id='type-id-3718'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3730'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
-            <return type-id='type-id-3718'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3730'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3742' is-artificial='yes'/>
             <parameter type-id='type-id-421'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-65'/>
             <parameter type-id='type-id-100'/>
             <return type-id='type-id-65'/>
@@ -26103,139 +26103,139 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv'>
-            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3712'>
+      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3724'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3794'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3714'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3781'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3726'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-3729' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-3741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
-                <parameter type-id='type-id-3796'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
+                <parameter type-id='type-id-3783'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3795' is-artificial='yes'/>
-                <parameter type-id='type-id-3797'/>
+                <parameter type-id='type-id-3782' is-artificial='yes'/>
+                <parameter type-id='type-id-3784'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3799' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3798'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3785'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3800' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3729'/>
+          <typedef-decl name='pointer' type-id='type-id-3787' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3741'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3801'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3788'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3794' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3781' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3784'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3804'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3791'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3804'/>
-            <parameter type-id='type-id-3803'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3791'/>
+            <parameter type-id='type-id-3790'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
-            <return type-id='type-id-3729'/>
+            <return type-id='type-id-3741'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <return type-id='type-id-3805'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <return type-id='type-id-3792'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m'>
-            <parameter type-id='type-id-3802' is-artificial='yes'/>
-            <parameter type-id='type-id-3729'/>
+            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3741'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3806' is-artificial='yes'/>
-            <return type-id='type-id-3796'/>
+            <parameter type-id='type-id-3793' is-artificial='yes'/>
+            <return type-id='type-id-3783'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26266,19 +26266,19 @@
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3892'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3778' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3891'/>
+          <typedef-decl name='value_type' type-id='type-id-3795' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3891'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-3893' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3855'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3779' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3893'/>
+          <typedef-decl name='__pointer' type-id='type-id-3796' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3893'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='size_type' type-id='type-id-4073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-4072'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__size_type' type-id='type-id-3780' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-4073'/>
+          <typedef-decl name='__size_type' type-id='type-id-3797' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-4073'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_void_pointer' type-id='type-id-4075' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-4074'/>
@@ -26328,13 +26328,13 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8max_sizeERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8max_sizeERKS4_'>
-            <parameter type-id='type-id-3784'/>
+            <parameter type-id='type-id-3801'/>
             <return type-id='type-id-4072'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_max_size&lt;const std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, void&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE11_S_max_sizeIKS4_vEEmRT_i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE11_S_max_sizeIKS4_vEEmRT_i'>
-            <parameter type-id='type-id-3784'/>
+            <parameter type-id='type-id-3801'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-4072'/>
           </function-decl>
@@ -26348,45 +26348,45 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3714'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3777'/>
+      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3726'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3794'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3778'/>
+          <typedef-decl name='value_type' type-id='type-id-419' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3795'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3779'/>
+          <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3796'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3780'/>
+          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3797'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3781'>
+          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3798'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3782'/>
+              <typedef-decl name='other' type-id='type-id-3726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3799'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
-            <parameter type-id='type-id-3784'/>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
+            <parameter type-id='type-id-3801'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-3783' is-artificial='yes'/>
+            <parameter type-id='type-id-3800' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3777' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4079'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3794' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4079'/>
       <class-decl name='pointer_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-4080'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-4081'/>
@@ -26411,45 +26411,45 @@
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, mongo::executor::TaskExecutor::CallbackHandle, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3909'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3782' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3894'/>
+          <typedef-decl name='__type' type-id='type-id-3799' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3894'/>
         </member-type>
       </class-decl>
       <typedef-decl name='_Require&lt;__has_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' type-id='type-id-2847' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-4077'/>
       <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' type-id='type-id-2847' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-4078'/>
       <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3616'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3634'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3636'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
-            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
-            <parameter type-id='type-id-3639'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
+            <parameter type-id='type-id-3641'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_'>
-            <parameter type-id='type-id-3635' is-artificial='yes'/>
+            <parameter type-id='type-id-3637' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
@@ -26457,44 +26457,44 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3668'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3636'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3661'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-569'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3669'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3662'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
-            <parameter type-id='type-id-3671'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
+            <parameter type-id='type-id-3664'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
-            <parameter type-id='type-id-3672'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
+            <parameter type-id='type-id-3665'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3663' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
@@ -26503,54 +26503,54 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_'>
-            <parameter type-id='type-id-3673'/>
+            <parameter type-id='type-id-3666'/>
             <return type-id='type-id-1908'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_'>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3666'/>
+            <return type-id='type-id-3667'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3668'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3697'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3698'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3661'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3693'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3694'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3697' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3699'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3695'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3701'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3697'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3702'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3698'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
+            <parameter type-id='type-id-3696' is-artificial='yes'/>
             <parameter type-id='type-id-3612'/>
             <parameter type-id='type-id-3618'/>
             <return type-id='type-id-60'/>
@@ -26558,104 +26558,104 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_'>
-            <parameter type-id='type-id-3703'/>
-            <return type-id='type-id-3704'/>
+            <parameter type-id='type-id-3699'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_'>
-            <parameter type-id='type-id-3703'/>
-            <return type-id='type-id-3705'/>
+            <parameter type-id='type-id-3699'/>
+            <return type-id='type-id-3701'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3697'>
+      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3693'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2092'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3747'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3716'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3748'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3717'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3750'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3719'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
-            <parameter type-id='type-id-3751'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3720'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3749' is-artificial='yes'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
             <parameter type-id='type-id-3618'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_'>
-            <parameter type-id='type-id-3752'/>
-            <return type-id='type-id-3753'/>
+            <parameter type-id='type-id-3721'/>
+            <return type-id='type-id-3722'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_'>
-            <parameter type-id='type-id-3752'/>
-            <return type-id='type-id-3754'/>
+            <parameter type-id='type-id-3721'/>
+            <return type-id='type-id-3723'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3747'>
+      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3716'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1606' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3791'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3778'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
-            <parameter type-id='type-id-3792'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
+            <parameter type-id='type-id-3779'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -26663,52 +26663,52 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_'>
-            <parameter type-id='type-id-3790' is-artificial='yes'/>
+            <parameter type-id='type-id-3777' is-artificial='yes'/>
             <parameter type-id='type-id-3618'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_'>
-            <parameter type-id='type-id-3793'/>
-            <return type-id='type-id-3753'/>
+            <parameter type-id='type-id-3780'/>
+            <return type-id='type-id-3722'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3698'>
+      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3694'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-3644' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-3646' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3744'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3713'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
-            <parameter type-id='type-id-3745'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
+            <parameter type-id='type-id-3714'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -26716,15 +26716,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-3743' is-artificial='yes'/>
+            <parameter type-id='type-id-3712' is-artificial='yes'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-3746'/>
-            <return type-id='type-id-3704'/>
+            <parameter type-id='type-id-3715'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -26781,85 +26781,85 @@
         </member-function>
       </class-decl>
       <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3608'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3646'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3628'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3646'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3628'/>
       <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3610'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3640'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3642'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
-            <parameter type-id='type-id-3642'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3644'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
-            <parameter type-id='type-id-3643'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3645'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-3641' is-artificial='yes'/>
+            <parameter type-id='type-id-3643' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3640'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3675'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3642'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3668'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-569'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3676'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3669'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
-            <parameter type-id='type-id-3678'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3671'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
-            <parameter type-id='type-id-3679'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
+            <parameter type-id='type-id-3672'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3677' is-artificial='yes'/>
+            <parameter type-id='type-id-3670' is-artificial='yes'/>
             <parameter type-id='type-id-707'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
@@ -26867,174 +26867,174 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3680'/>
+            <parameter type-id='type-id-3673'/>
             <return type-id='type-id-1908'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-3680'/>
-            <return type-id='type-id-3681'/>
+            <parameter type-id='type-id-3673'/>
+            <return type-id='type-id-3674'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3675'>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3668'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2073'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3698'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3694'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3706'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3702'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3638'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3708'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3704'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
-            <parameter type-id='type-id-3709'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
+            <parameter type-id='type-id-3705'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3707' is-artificial='yes'/>
+            <parameter type-id='type-id-3703' is-artificial='yes'/>
             <parameter type-id='type-id-3612'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_'>
-            <parameter type-id='type-id-3710'/>
-            <return type-id='type-id-3704'/>
+            <parameter type-id='type-id-3706'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-3710'/>
-            <return type-id='type-id-3711'/>
+            <parameter type-id='type-id-3706'/>
+            <return type-id='type-id-3707'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3623'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3627'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3629'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
-            <parameter type-id='type-id-3629'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
+            <parameter type-id='type-id-3631'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3628' is-artificial='yes'/>
+            <parameter type-id='type-id-3630' is-artificial='yes'/>
             <parameter type-id='type-id-3613'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3627'>
+      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3629'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2050'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3656'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3649'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3657'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3650'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3659'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
+            <parameter type-id='type-id-3652'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3660'/>
+            <parameter type-id='type-id-3651' is-artificial='yes'/>
+            <parameter type-id='type-id-3653'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3661'/>
+            <parameter type-id='type-id-3654'/>
             <return type-id='type-id-429'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3656'>
+      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3649'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-429' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <parameter type-id='type-id-429'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
-            <parameter type-id='type-id-3690'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
+            <parameter type-id='type-id-3686'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
-            <parameter type-id='type-id-3691'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
+            <parameter type-id='type-id-3687'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -27042,7 +27042,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_'>
-            <parameter type-id='type-id-3692'/>
+            <parameter type-id='type-id-3688'/>
             <return type-id='type-id-429'/>
           </function-decl>
         </member-function>
@@ -27088,7 +27088,7 @@
         <member-function access='private'>
           <function-decl name='__call&lt;void, mongo::executor::TaskExecutor::CallbackHandle &amp;, 0, 1&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEE6__callIvJRS6_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEE6__callIvJRS6_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
             <parameter type-id='type-id-3983' is-artificial='yes'/>
-            <parameter type-id='type-id-3633'/>
+            <parameter type-id='type-id-3635'/>
             <parameter type-id='type-id-2860'/>
             <return type-id='type-id-60'/>
           </function-decl>
@@ -27263,109 +27263,109 @@
         </member-function>
       </class-decl>
       <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3624'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3630'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3632'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
-            <parameter type-id='type-id-3632'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
+            <parameter type-id='type-id-3634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3631' is-artificial='yes'/>
-            <parameter type-id='type-id-3633'/>
+            <parameter type-id='type-id-3633' is-artificial='yes'/>
+            <parameter type-id='type-id-3635'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3630'>
+      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3632'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2050'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3662'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3655'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3663'/>
+          <typedef-decl name='_Inherited' type-id='type-id-2050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3656'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
-            <parameter type-id='type-id-3665'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <parameter type-id='type-id-3658'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3664' is-artificial='yes'/>
-            <parameter type-id='type-id-3666'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <parameter type-id='type-id-3659'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_'>
-            <parameter type-id='type-id-3667'/>
+            <parameter type-id='type-id-3660'/>
             <return type-id='type-id-1634'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3662'>
+      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3655'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1634' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <parameter type-id='type-id-1634'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
-            <parameter type-id='type-id-3694'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3690'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
-            <parameter type-id='type-id-3695'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
+            <parameter type-id='type-id-3691'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3689' is-artificial='yes'/>
             <parameter type-id='type-id-2854'/>
             <parameter type-id='type-id-2855'/>
             <return type-id='type-id-60'/>
@@ -27373,7 +27373,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_'>
-            <parameter type-id='type-id-3696'/>
+            <parameter type-id='type-id-3692'/>
             <return type-id='type-id-1634'/>
           </function-decl>
         </member-function>
@@ -27460,44 +27460,44 @@
         </member-function>
       </class-decl>
       <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3820'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3860'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3872'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3861'/>
+          <typedef-decl name='value_type' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3873'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3862'/>
+          <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-3874'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3863'/>
+          <typedef-decl name='size_type' type-id='type-id-64' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='95' column='1' id='type-id-3875'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3864'>
+          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3876'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3865'/>
+              <typedef-decl name='other' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3877'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
-            <parameter type-id='type-id-3867'/>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
+            <parameter type-id='type-id-3879'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev'>
-            <parameter type-id='type-id-3866' is-artificial='yes'/>
+            <parameter type-id='type-id-3878' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4105'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4105'/>
       <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4106'>
         <member-type access='public'>
           <typedef-decl name='type' type-id='type-id-2963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4023'/>
@@ -27505,12 +27505,12 @@
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-4107'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3704' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4108'/>
+          <typedef-decl name='type' type-id='type-id-3700' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4108'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4109'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3644' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4017'/>
+          <typedef-decl name='type' type-id='type-id-3646' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4017'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-4110'>
@@ -27530,12 +27530,12 @@
       </class-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4114'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4031'/>
+          <typedef-decl name='type' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4031'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-4115'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3644' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4019'/>
+          <typedef-decl name='type' type-id='type-id-3646' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4019'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-4116'>
@@ -27550,7 +27550,7 @@
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-4118'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3753' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4119'/>
+          <typedef-decl name='type' type-id='type-id-3722' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4119'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4120'>
@@ -27570,12 +27570,12 @@
       </class-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4123'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4029'/>
+          <typedef-decl name='type' type-id='type-id-3661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4029'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4124'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3697' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4035'/>
+          <typedef-decl name='type' type-id='type-id-3693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4035'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-4125'>
@@ -27590,7 +27590,7 @@
       </class-decl>
       <class-decl name='_Vector_base&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3818'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3876'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3860'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3820'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-3835' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
@@ -27603,103 +27603,103 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
-                <parameter type-id='type-id-3878'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
+                <parameter type-id='type-id-3862'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3877' is-artificial='yes'/>
-                <parameter type-id='type-id-3879'/>
+                <parameter type-id='type-id-3861' is-artificial='yes'/>
+                <parameter type-id='type-id-3863'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3881' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3880'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3864'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3882' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3835'/>
+          <typedef-decl name='pointer' type-id='type-id-3866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3835'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3883'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3867'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3876' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3860' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-64'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3879'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3886'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3870'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <parameter type-id='type-id-3886'/>
-            <parameter type-id='type-id-3885'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <parameter type-id='type-id-3870'/>
+            <parameter type-id='type-id-3869'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
-            <return type-id='type-id-3887'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
+            <return type-id='type-id-3871'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m'>
-            <parameter type-id='type-id-3884' is-artificial='yes'/>
+            <parameter type-id='type-id-3868' is-artificial='yes'/>
             <parameter type-id='type-id-3835'/>
             <parameter type-id='type-id-64'/>
             <return type-id='type-id-60'/>
@@ -27708,19 +27708,19 @@
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3912'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3861' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3911'/>
+          <typedef-decl name='value_type' type-id='type-id-3873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3911'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-3913' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3906'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3862' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3913'/>
+          <typedef-decl name='__pointer' type-id='type-id-3874' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3913'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='size_type' type-id='type-id-4128' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-4127'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__size_type' type-id='type-id-3863' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-4128'/>
+          <typedef-decl name='__size_type' type-id='type-id-3875' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-4128'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_void_pointer' type-id='type-id-4130' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-4129'/>
@@ -27764,33 +27764,33 @@
       </class-decl>
       <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt;, mongo::executor::RemoteCommandRequest, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3915'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3914'/>
+          <typedef-decl name='__type' type-id='type-id-3877' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3914'/>
         </member-type>
       </class-decl>
       <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3841'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3868'/>
+          <typedef-decl name='iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3880'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3869'/>
+          <typedef-decl name='const_iterator' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3881'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-3868' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
+          <var-decl name='_M_array' type-id='type-id-3880' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_len' type-id='type-id-65' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3870' is-artificial='yes'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3882' is-artificial='yes'/>
+            <parameter type-id='type-id-3881'/>
             <parameter type-id='type-id-65'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3870' is-artificial='yes'/>
+            <parameter type-id='type-id-3882' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -27855,17 +27855,17 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ScatterGatherRunner *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-3974' is-artificial='yes'/>
-            <parameter type-id='type-id-3704'/>
+            <parameter type-id='type-id-3700'/>
             <parameter type-id='type-id-3013'/>
-            <return type-id='type-id-3704'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ScatterGatherRunner *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-3974' is-artificial='yes'/>
-            <parameter type-id='type-id-3704'/>
+            <parameter type-id='type-id-3700'/>
             <parameter type-id='type-id-2638'/>
-            <return type-id='type-id-3704'/>
+            <return type-id='type-id-3700'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27891,9 +27891,9 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0ELb0EEclIRS6_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SG_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0ELb0EEclIRS6_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SG_RT0_'>
             <parameter type-id='type-id-3971' is-artificial='yes'/>
-            <parameter type-id='type-id-3753'/>
+            <parameter type-id='type-id-3722'/>
             <parameter type-id='type-id-2638'/>
-            <return type-id='type-id-3753'/>
+            <return type-id='type-id-3722'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27905,9 +27905,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3735'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3721'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3723'/>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3747'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3733'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3735'/>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_'>
         <parameter type-id='type-id-4060' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-707' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
@@ -27922,8 +27922,8 @@
         <return type-id='type-id-4087'/>
       </function-decl>
       <function-decl name='for_each&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &gt;' mangled-name='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_'>
-        <parameter type-id='type-id-3717' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
-        <parameter type-id='type-id-3717' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
+        <parameter type-id='type-id-3729' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
+        <parameter type-id='type-id-3729' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
         <parameter type-id='type-id-3926' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
         <return type-id='type-id-3926'/>
       </function-decl>
@@ -27969,7 +27969,7 @@
         <return type-id='type-id-4100'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERN5mongo8executor12TaskExecutor14CallbackHandleEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERN5mongo8executor12TaskExecutor14CallbackHandleEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-3667' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3660' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-4100'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
@@ -28078,15 +28078,15 @@
         <return type-id='type-id-4108'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE'>
-        <parameter type-id='type-id-3710' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3706' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-4108'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ScatterGatherRunner *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-4018' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3704'/>
+        <return type-id='type-id-3700'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-3680' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3673' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-2878'/>
       </function-decl>
       <function-decl name='get&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
@@ -28094,7 +28094,7 @@
         <return type-id='type-id-4111'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-3661' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3654' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-4111'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_'>
@@ -28106,7 +28106,7 @@
         <return type-id='type-id-4042'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-3710' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-3706' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-4032'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt7forwardIPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS4_E4typeE'>
@@ -28134,19 +28134,19 @@
         <return type-id='type-id-4119'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE'>
-        <parameter type-id='type-id-3752' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3721' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-4119'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE'>
         <parameter type-id='type-id-4014' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3753'/>
+        <return type-id='type-id-3722'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE'>
-        <parameter type-id='type-id-3703' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3699' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-4108'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE'>
-        <parameter type-id='type-id-3673' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <parameter type-id='type-id-3666' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
         <return type-id='type-id-2878'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_'>
@@ -28158,11 +28158,11 @@
         <return type-id='type-id-4040'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS1_10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS1_10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-3703' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-3699' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-4030'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJPN5mongo10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJPN5mongo10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSB_'>
-        <parameter type-id='type-id-3752' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-3721' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-4036'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt7forwardIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS7_E4typeE'>
@@ -28250,7 +28250,7 @@
         </member-function>
       </class-decl>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3654'>
+        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3680'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_algorithm' type-id='type-id-3682' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
           </data-member>
@@ -28271,34 +28271,34 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ScatterGatherRunner' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-3684'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC1EPNS0_22ScatterGatherAlgorithmE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-3682'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD1Ev'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='start' mangled-name='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <parameter type-id='type-id-1235'/>
               <return type-id='type-id-386'/>
@@ -28306,7 +28306,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_signalSufficientResponsesReceived' mangled-name='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-60'/>
             </function-decl>
@@ -28314,13 +28314,13 @@
           <member-function access='private' static='yes'>
             <function-decl name='_processResponse' mangled-name='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_'>
               <parameter type-id='type-id-429'/>
-              <parameter type-id='type-id-3644'/>
+              <parameter type-id='type-id-3646'/>
               <return type-id='type-id-60'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3644' is-artificial='yes'/>
+              <parameter type-id='type-id-3646' is-artificial='yes'/>
               <parameter type-id='type-id-1678'/>
               <return type-id='type-id-60'/>
             </function-decl>
@@ -28328,7 +28328,7 @@
         </class-decl>
       </namespace-decl>
       <function-decl name='MakeGuard&lt;void, mongo::repl::ScatterGatherRunner, mongo::repl::ScatterGatherRunner, mongo::repl::ReplicationExecutor *, mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_' filepath='src/mongo/util/scopeguard.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_'>
-        <parameter type-id='type-id-3644' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
+        <parameter type-id='type-id-3646' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
         <parameter type-id='type-id-1678' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
         <return type-id='type-id-3975'/>
       </function-decl>
@@ -28339,7 +28339,7 @@
       </function-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3717'>
+      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3729'>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3765' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3764'/>
         </member-type>
@@ -28384,7 +28384,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3719'>
+      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3731'>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3756' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3755'/>
         </member-type>
@@ -28422,24 +28422,24 @@
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3856'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3857' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3799'/>
+              <typedef-decl name='other' type-id='type-id-3857' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3786'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3800'/>
+          <typedef-decl name='pointer' type-id='type-id-3855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3787'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3809' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3725'/>
+          <typedef-decl name='reference' type-id='type-id-3809' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3737'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-3891' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3810'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3727'/>
+          <typedef-decl name='const_reference' type-id='type-id-3808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3739'/>
         </member-type>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3777'>
+      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3794'>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3811'/>
         </member-type>
@@ -28509,7 +28509,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3860'>
+      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3872'>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3896'/>
         </member-type>
@@ -28555,12 +28555,12 @@
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3907'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3881'/>
+              <typedef-decl name='other' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3865'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3882'/>
+          <typedef-decl name='pointer' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3866'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-3890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3831'/>
@@ -28598,13 +28598,13 @@
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-3647'>
       <parameter type-id='type-id-415'/>
-      <parameter type-id='type-id-3644'/>
+      <parameter type-id='type-id-3646'/>
       <parameter type-id='type-id-1606'/>
       <return type-id='type-id-60'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-3648'>
       <parameter type-id='type-id-429'/>
-      <parameter type-id='type-id-3644'/>
+      <parameter type-id='type-id-3646'/>
       <return type-id='type-id-60'/>
     </function-type>
   </abi-instr>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index d078079b..39ac2d40 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -587,12 +587,6 @@
     <typedef-decl name='DBusDispatchStatusFunction' type-id='type-id-62' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='128' column='1' id='type-id-39'/>
     <typedef-decl name='DBusFreeFunction' type-id='type-id-63' filepath='../dbus/dbus-memory.h' line='64' column='1' id='type-id-38'/>
     <typedef-decl name='DBusWakeupMainFunction' type-id='type-id-63' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='135' column='1' id='type-id-37'/>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='80' column='1' id='type-id-61'>
-      <underlying-type type-id='type-id-42'/>
-      <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
-      <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
-      <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
-    </enum-decl>
     <class-decl name='DBusAtomic' size-in-bits='32' is-struct='yes' visibility='default' filepath='../dbus/dbus-sysdeps.h' line='228' column='1' id='type-id-59'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='value' type-id='type-id-64' visibility='default' filepath='../dbus/dbus-sysdeps.h' line='232' column='1'/>
@@ -606,6 +600,12 @@
         <var-decl name='n_slots' type-id='type-id-2' visibility='default' filepath='../dbus/dbus-dataslot.h' line='72' column='1'/>
       </data-member>
     </class-decl>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.h' line='80' column='1' id='type-id-61'>
+      <underlying-type type-id='type-id-42'/>
+      <enumerator name='DBUS_DISPATCH_DATA_REMAINS' value='0'/>
+      <enumerator name='DBUS_DISPATCH_COMPLETE' value='1'/>
+      <enumerator name='DBUS_DISPATCH_NEED_MEMORY' value='2'/>
+    </enum-decl>
     <typedef-decl name='DBusCMutex' type-id='type-id-66' filepath='../dbus/dbus-threads-internal.h' line='45' column='1' id='type-id-49'/>
     <typedef-decl name='DBusCondVar' type-id='type-id-67' filepath='../dbus/dbus-threads.h' line='43' column='1' id='type-id-50'/>
     <typedef-decl name='DBusCounter' type-id='type-id-68' filepath='../dbus/dbus-resources.h' line='32' column='1' id='type-id-51'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 58a3a0d5..d0c9dae2 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -466,6 +466,7 @@
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-35'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-21'/>
     <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-24'/>
+    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-29'/>
     <type-decl name='float' size-in-bits='32' id='type-id-28'/>
     <function-type size-in-bits='64' id='type-id-36'>
       <parameter type-id='type-id-34'/>
@@ -478,7 +479,6 @@
     </function-type>
     <type-decl name='int' size-in-bits='32' id='type-id-11'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
-    <class-decl name='CurveMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-29'/>
     <typedef-decl name='GLfloat' type-id='type-id-28' filepath='../../../include/GL/gl.h' line='160' column='1' id='type-id-32'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
     <type-decl name='void' id='type-id-12'/>
@@ -1107,164 +1107,18 @@
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-51'/>
-    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
-      <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='renderhints' type-id='type-id-70' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='320'>
-        <var-decl name='maplist' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
-      </data-member>
-      <data-member access='protected' layout-offset-in-bits='3008'>
-        <var-decl name='backend' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='3648'>
-        <var-decl name='subdivider' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='24064'>
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='24128'>
-        <var-decl name='o_pwlcurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='26624'>
-        <var-decl name='o_nurbscurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='29120'>
-        <var-decl name='o_curvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='31616'>
-        <var-decl name='o_trimPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='34112'>
-        <var-decl name='o_surfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='36608'>
-        <var-decl name='o_nurbssurfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='39104'>
-        <var-decl name='propertyPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='41600'>
-        <var-decl name='quiltPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='44096'>
-        <var-decl name='extTrimVertexPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46720'>
-        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46752'>
-        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46784'>
-        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46816'>
-        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46848'>
-        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46880'>
-        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46912'>
-        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46944'>
-        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='46976'>
-        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47040'>
-        <var-decl name='nextTrim' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47104'>
-        <var-decl name='nextCurve' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47168'>
-        <var-decl name='nextNurbscurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47232'>
-        <var-decl name='nextPwlcurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47296'>
-        <var-decl name='nextNurbssurface' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47360'>
-        <var-decl name='currentSurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47424'>
-        <var-decl name='currentTrim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47488'>
-        <var-decl name='currentCurve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='47552'>
-        <var-decl name='dl' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-87'/>
-          <parameter type-id='type-id-88'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes' vtable-offset='-1'>
-        <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='2'>
-        <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='3'>
-        <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='4'>
-        <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='5'>
-        <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' vtable-offset='6'>
-        <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-62'/>
     <class-decl name='BasicSurfaceEvaluator' size-in-bits='64' is-struct='yes' visibility='default' filepath='libnurbs/internals/basicsurfeval.h' line='43' column='1' id='type-id-48'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <function-decl name='range2f' mangled-name='_ZN21BasicSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/internals/basicsurfeval.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-16'/>
@@ -1273,7 +1127,7 @@
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <function-decl name='domain2f' mangled-name='_ZN21BasicSurfaceEvaluator8domain2fEffff' filepath='libnurbs/internals/basicsurfeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -1283,28 +1137,28 @@
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN21BasicSurfaceEvaluator6enableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN21BasicSurfaceEvaluator7disableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <function-decl name='bgnmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/internals/basicsurfeval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <function-decl name='map2f' mangled-name='_ZN21BasicSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/internals/basicsurfeval.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -1320,7 +1174,7 @@
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <function-decl name='mapgrid2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/internals/basicsurfeval.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -1332,7 +1186,7 @@
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <function-decl name='mapmesh2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/internals/basicsurfeval.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
@@ -1343,7 +1197,7 @@
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <function-decl name='evalcoord2f' mangled-name='_ZN21BasicSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/internals/basicsurfeval.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -1352,7 +1206,7 @@
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <function-decl name='evalpoint2i' mangled-name='_ZN21BasicSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/internals/basicsurfeval.cc' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
@@ -1360,86 +1214,86 @@
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <function-decl name='endmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8endmap2fEv' filepath='libnurbs/internals/basicsurfeval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <function-decl name='polymode' mangled-name='_ZN21BasicSurfaceEvaluator8polymodeEl' filepath='libnurbs/internals/basicsurfeval.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
         <function-decl name='bgnline' mangled-name='_ZN21BasicSurfaceEvaluator7bgnlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
         <function-decl name='endline' mangled-name='_ZN21BasicSurfaceEvaluator7endlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
         <function-decl name='bgnclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
         <function-decl name='endclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
         <function-decl name='bgntmesh' mangled-name='_ZN21BasicSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
         <function-decl name='swaptmesh' mangled-name='_ZN21BasicSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
         <function-decl name='endtmesh' mangled-name='_ZN21BasicSurfaceEvaluator8endtmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
         <function-decl name='bgnqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
         <function-decl name='endqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9endqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
         <function-decl name='bgntfan' mangled-name='_ZN21BasicSurfaceEvaluator7bgntfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
         <function-decl name='endtfan' mangled-name='_ZN21BasicSurfaceEvaluator7endtfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
         <function-decl name='evalUStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -1451,7 +1305,7 @@
       </member-function>
       <member-function access='public' vtable-offset='33'>
         <function-decl name='evalVStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -1463,7 +1317,7 @@
       </member-function>
       <member-function access='public' vtable-offset='34'>
         <function-decl name='inDoEvalCoord2NOGE' mangled-name='_ZN21BasicSurfaceEvaluator18inDoEvalCoord2NOGEEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -1473,7 +1327,7 @@
       </member-function>
       <member-function access='public' vtable-offset='35'>
         <function-decl name='inDoEvalCoord2NOGE_BU' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BUEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -1483,7 +1337,7 @@
       </member-function>
       <member-function access='public' vtable-offset='36'>
         <function-decl name='inDoEvalCoord2NOGE_BV' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BVEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -1493,221 +1347,192 @@
       </member-function>
       <member-function access='public' vtable-offset='37'>
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='38'>
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='GLboolean' type-id='type-id-91' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-45'/>
-    <typedef-decl name='GLenum' type-id='type-id-92' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-59'/>
-    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-63'/>
-    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-60'/>
-    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-44'/>
-    <typedef-decl name='surfEvalMachine' type-id='type-id-93' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-54'/>
-    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-87'/>
-    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-88'/>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-90'/>
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-74'/>
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
-    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-79'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-81'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-82'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-77'/>
-    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-67'/>
-    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='mapdescPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2496'>
-        <var-decl name='maps' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2560'>
-        <var-decl name='lastmap' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+    <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
+      <data-member access='protected' layout-offset-in-bits='64'>
+        <var-decl name='renderhints' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='2624'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+      <data-member access='protected' layout-offset-in-bits='320'>
+        <var-decl name='maplist' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
       </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-106' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-75'>
-      <member-type access='protected'>
-        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-108'>
-          <underlying-type type-id='type-id-9'/>
-          <enumerator name='is_allocated' value='62369'/>
-          <enumerator name='is_free' value='61858'/>
-        </enum-decl>
-      </member-type>
-      <data-member access='protected' layout-offset-in-bits='0'>
-        <var-decl name='freelist' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
+      <data-member access='protected' layout-offset-in-bits='3008'>
+        <var-decl name='backend' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='blocklist' type-id='type-id-110' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
+      <data-member access='private' layout-offset-in-bits='3648'>
+        <var-decl name='subdivider' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2112'>
-        <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+      <data-member access='private' layout-offset-in-bits='24064'>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2176'>
-        <var-decl name='curblock' type-id='type-id-111' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
+      <data-member access='private' layout-offset-in-bits='24128'>
+        <var-decl name='o_pwlcurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2240'>
-        <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+      <data-member access='private' layout-offset-in-bits='26624'>
+        <var-decl name='o_nurbscurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2272'>
-        <var-decl name='nextsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+      <data-member access='private' layout-offset-in-bits='29120'>
+        <var-decl name='o_curvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2304'>
-        <var-decl name='nextfree' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+      <data-member access='private' layout-offset-in-bits='31616'>
+        <var-decl name='o_trimPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2336'>
-        <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+      <data-member access='private' layout-offset-in-bits='34112'>
+        <var-decl name='o_surfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2368'>
-        <var-decl name='name' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
+      <data-member access='private' layout-offset-in-bits='36608'>
+        <var-decl name='o_nurbssurfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
       </data-member>
-      <data-member access='protected' layout-offset-in-bits='2432'>
-        <var-decl name='magic' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
+      <data-member access='private' layout-offset-in-bits='39104'>
+        <var-decl name='propertyPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
       </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-113' is-artificial='yes'/>
-          <parameter type-id='type-id-11'/>
-          <parameter type-id='type-id-11'/>
-          <parameter type-id='type-id-112'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-113' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-73'>
-      <member-type access='private'>
-        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-114'>
-          <underlying-type type-id='type-id-9'/>
-          <enumerator name='down' value='0'/>
-          <enumerator name='same' value='1'/>
-          <enumerator name='up' value='2'/>
-          <enumerator name='none' value='3'/>
-        </enum-decl>
-      </member-type>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='slicer' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
+      <data-member access='private' layout-offset-in-bits='41600'>
+        <var-decl name='quiltPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='8064'>
-        <var-decl name='arctessellator' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
+      <data-member access='private' layout-offset-in-bits='44096'>
+        <var-decl name='extTrimVertexPool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='8192'>
-        <var-decl name='arcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46720'>
+        <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='10688'>
-        <var-decl name='bezierarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46752'>
+        <var-decl name='inCurve' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='149' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='13184'>
-        <var-decl name='pwlarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46784'>
+        <var-decl name='inTrim' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='150' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='15680'>
-        <var-decl name='trimvertexpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46816'>
+        <var-decl name='isCurveModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='151' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18304'>
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46848'>
+        <var-decl name='isTrimModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='152' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18368'>
-        <var-decl name='renderhints' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46880'>
+        <var-decl name='isSurfaceModified' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='153' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18432'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46912'>
+        <var-decl name='isDataValid' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='154' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18496'>
-        <var-decl name='initialbin' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46944'>
+        <var-decl name='numTrims' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='155' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18624'>
-        <var-decl name='pjarc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
+      <data-member access='private' layout-offset-in-bits='46976'>
+        <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18688'>
-        <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47040'>
+        <var-decl name='nextTrim' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18720'>
-        <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47104'>
+        <var-decl name='nextCurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18752'>
-        <var-decl name='qlist' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47168'>
+        <var-decl name='nextNurbscurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='18816'>
-        <var-decl name='spbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47232'>
+        <var-decl name='nextPwlcurve' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='19136'>
-        <var-decl name='tpbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47296'>
+        <var-decl name='nextNurbssurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='19456'>
-        <var-decl name='smbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47360'>
+        <var-decl name='currentSurface' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='19776'>
-        <var-decl name='tmbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47424'>
+        <var-decl name='currentTrim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='20096'>
-        <var-decl name='stepsizes' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47488'>
+        <var-decl name='currentCurve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
       </data-member>
-      <data-member access='private' layout-offset-in-bits='20224'>
-        <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='20256'>
-        <var-decl name='isArcTypeBezier' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='20288'>
-        <var-decl name='domain_distance_u_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='188' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='20320'>
-        <var-decl name='domain_distance_v_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='189' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='20352'>
-        <var-decl name='is_domain_distance_sampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+      <data-member access='private' layout-offset-in-bits='47552'>
+        <var-decl name='dl' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
-        <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-123' is-artificial='yes'/>
-          <parameter type-id='type-id-124'/>
-          <parameter type-id='type-id-107'/>
+        <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <parameter type-id='type-id-88'/>
+          <parameter type-id='type-id-89'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+      <member-function access='private' destructor='yes' vtable-offset='-1'>
+        <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='2'>
+        <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='3'>
+        <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='4'>
+        <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='5'>
+        <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' vtable-offset='6'>
+        <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-89'/>
-    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-72'>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-62'/>
+    <typedef-decl name='GLboolean' type-id='type-id-91' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-45'/>
+    <typedef-decl name='GLenum' type-id='type-id-92' filepath='../../../include/GL/gl.h' line='149' column='1' id='type-id-59'/>
+    <typedef-decl name='GLint' type-id='type-id-11' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-63'/>
+    <typedef-decl name='_GLUfuncptr' type-id='type-id-20' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-60'/>
+    <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-44'/>
+    <typedef-decl name='surfEvalMachine' type-id='type-id-93' filepath='libnurbs/interface/glsurfeval.h' line='80' column='1' id='type-id-54'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-88'/>
+    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-89'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-75'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-87'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-85'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-80'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-82'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-83'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
+    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-67'/>
+    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-73'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='curveEvaluator' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='surfaceEvaluator' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
+        <var-decl name='surfaceEvaluator' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
@@ -1719,21 +1544,97 @@
         <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
-        <var-decl name='mesh' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
+        <var-decl name='mesh' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-128' is-artificial='yes'/>
-          <parameter type-id='type-id-87'/>
+          <parameter type-id='type-id-106' is-artificial='yes'/>
           <parameter type-id='type-id-88'/>
+          <parameter type-id='type-id-89'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-72'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <var-decl name='mapdescPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2496'>
+        <var-decl name='maps' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2560'>
+        <var-decl name='lastmap' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2624'>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-110' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-70'>
+    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-76'>
+      <member-type access='protected'>
+        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-112'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='is_allocated' value='62369'/>
+          <enumerator name='is_free' value='61858'/>
+        </enum-decl>
+      </member-type>
+      <data-member access='protected' layout-offset-in-bits='0'>
+        <var-decl name='freelist' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='64'>
+        <var-decl name='blocklist' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2112'>
+        <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2176'>
+        <var-decl name='curblock' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2240'>
+        <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2272'>
+        <var-decl name='nextsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='67' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2304'>
+        <var-decl name='nextfree' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='68' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2336'>
+        <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2368'>
+        <var-decl name='name' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
+      </data-member>
+      <data-member access='protected' layout-offset-in-bits='2432'>
+        <var-decl name='magic' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-11'/>
+          <parameter type-id='type-id-116'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-71'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
       </data-member>
@@ -1760,14 +1661,112 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-129' is-artificial='yes'/>
+          <parameter type-id='type-id-118' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-76'>
+    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-74'>
+      <member-type access='private'>
+        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-119'>
+          <underlying-type type-id='type-id-9'/>
+          <enumerator name='down' value='0'/>
+          <enumerator name='same' value='1'/>
+          <enumerator name='up' value='2'/>
+          <enumerator name='none' value='3'/>
+        </enum-decl>
+      </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='pool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='slicer' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='8064'>
+        <var-decl name='arctessellator' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='8192'>
+        <var-decl name='arcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='10688'>
+        <var-decl name='bezierarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='13184'>
+        <var-decl name='pwlarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='15680'>
+        <var-decl name='trimvertexpool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18304'>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18368'>
+        <var-decl name='renderhints' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18432'>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18496'>
+        <var-decl name='initialbin' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18624'>
+        <var-decl name='pjarc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18688'>
+        <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18720'>
+        <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18752'>
+        <var-decl name='qlist' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='18816'>
+        <var-decl name='spbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='19136'>
+        <var-decl name='tpbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='19456'>
+        <var-decl name='smbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='19776'>
+        <var-decl name='tmbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20096'>
+        <var-decl name='stepsizes' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20224'>
+        <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20256'>
+        <var-decl name='isArcTypeBezier' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='134' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20288'>
+        <var-decl name='domain_distance_u_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='188' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20320'>
+        <var-decl name='domain_distance_v_rate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/subdivider.h' line='189' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='20352'>
+        <var-decl name='is_domain_distance_sampling' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='190' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
+          <parameter type-id='type-id-129'/>
+          <parameter type-id='type-id-111'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-77'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <var-decl name='pool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <var-decl name='vlist' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='53' column='1'/>
@@ -1898,42 +1897,43 @@
         <var-decl name='vcoeffDeriv' type-id='type-id-5' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='79' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-90'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-91'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-92'/>
-    <qualified-type-def type-id='type-id-107' id='type-id-105'/>
-    <reference-type-def kind='lvalue' type-id='type-id-72' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-128'/>
-    <qualified-type-def type-id='type-id-87' id='type-id-125'/>
-    <qualified-type-def type-id='type-id-88' id='type-id-126'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
+    <qualified-type-def type-id='type-id-111' id='type-id-109'/>
+    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-88' id='type-id-103'/>
+    <qualified-type-def type-id='type-id-89' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-113'/>
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-134'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-103'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-110'/>
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-97'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-98'/>
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-99'/>
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-120'/>
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-125'/>
+    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-105'>
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-127'>
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-124' id='type-id-117'/>
-    <reference-type-def kind='lvalue' type-id='type-id-70' size-in-bits='64' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-123'/>
+    <qualified-type-def type-id='type-id-129' id='type-id-122'/>
+    <reference-type-def kind='lvalue' type-id='type-id-71' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-128'/>
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-131'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-111'/>
-    <array-type-def dimensions='1' type-id='type-id-111' size-in-bits='2048' id='type-id-110'>
+    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-115'/>
+    <array-type-def dimensions='1' type-id='type-id-115' size-in-bits='2048' id='type-id-114'>
       <subrange length='32' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
-    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-116'>
+    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-121'>
       <data-member access='private' static='yes'>
         <var-decl name='gl_Bernstein' type-id='type-id-145' mangled-name='_ZN14ArcTessellator12gl_BernsteinE' visibility='default' filepath='libnurbs/internals/arctess.h' line='60' column='1'/>
       </data-member>
@@ -1959,12 +1959,12 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-118'>
+    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-123'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
+        <var-decl name='head' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='current' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
+        <var-decl name='current' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Bin' filepath='libnurbs/internals/bin.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1985,30 +1985,30 @@
         <var-decl name='nodes' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='73' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='dlnodePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
+        <var-decl name='dlnodePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <var-decl name='lastNode' type-id='type-id-153' visibility='default' filepath='libnurbs/internals/displaylist.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
-        <var-decl name='nt' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
+        <var-decl name='nt' type-id='type-id-87' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='DisplayList' filepath='libnurbs/internals/displaylist.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-85' is-artificial='yes'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~DisplayList' filepath='libnurbs/internals/displaylist.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-121'>
+    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-126'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
@@ -2038,83 +2038,15 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-115'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
-      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-157'/>
-      <data-member access='private' layout-offset-in-bits='5248'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5312'>
-        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5344'>
-        <var-decl name='du' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5376'>
-        <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5408'>
-        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5440'>
-        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5472'>
-        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-158' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-158' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-102'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='32'>
-        <var-decl name='coord' type-id='type-id-160' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='point' type-id='type-id-161' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-67' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-67' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-133'/>
     <class-decl name='JumpBuffer' size-in-bits='1600' is-struct='yes' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='56' column='1' id='type-id-95'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buf' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
+        <var-decl name='buf' type-id='type-id-156' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-96'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-165'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
           <data-member access='private'>
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
@@ -2124,16 +2056,16 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='curve' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
+        <var-decl name='curve' type-id='type-id-158' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='curvetype' type-id='type-id-166' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
+        <var-decl name='curvetype' type-id='type-id-159' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
+        <var-decl name='next' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
@@ -2146,18 +2078,18 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_curve' filepath='libnurbs/internals/reader.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-84' is-artificial='yes'/>
+          <parameter type-id='type-id-85' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='O_surface' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='112' column='1' id='type-id-100'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='o_nurbssurface' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='o_trim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
+        <var-decl name='o_trim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
@@ -2167,39 +2099,107 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_surface' filepath='libnurbs/internals/reader.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-82' is-artificial='yes'/>
+          <parameter type-id='type-id-83' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='O_trim' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='94' column='1' id='type-id-101'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='o_curve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
+        <var-decl name='o_curve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
+        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_trim' filepath='libnurbs/internals/reader.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-83' is-artificial='yes'/>
+          <parameter type-id='type-id-84' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-119'/>
+    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-120'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
+      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-161'/>
+      <data-member access='private' layout-offset-in-bits='5248'>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5312'>
+        <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5344'>
+        <var-decl name='du' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5376'>
+        <var-decl name='dv' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='74' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5408'>
+        <var-decl name='isolines' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='75' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5440'>
+        <var-decl name='ulinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='81' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5472'>
+        <var-decl name='vlinear' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/slicer.h' line='82' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-102'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='32'>
+        <var-decl name='coord' type-id='type-id-164' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='128'>
+        <var-decl name='point' type-id='type-id-165' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-11' size-in-bits='64' id='type-id-133'/>
+    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-124'/>
     <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-148'/>
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-151'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-152'/>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-155'/>
     <qualified-type-def type-id='type-id-150' id='type-id-146'/>
-    <reference-type-def kind='lvalue' type-id='type-id-75' size-in-bits='64' id='type-id-150'/>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-160'>
+    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-150'/>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-164'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='infinite' id='type-id-145'>
@@ -2207,20 +2207,20 @@
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-162'/>
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-141'/>
     <qualified-type-def type-id='type-id-149' id='type-id-147'/>
-    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-149'/>
+    <reference-type-def kind='lvalue' type-id='type-id-77' size-in-bits='64' id='type-id-149'/>
     <type-decl name='char' size-in-bits='8' id='type-id-143'/>
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-135'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
+        <var-decl name='next' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-156'>
+    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-160'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
         <var-decl name='MAXSTRIPSIZE' type-id='type-id-174' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.cc' line='50' column='1'/>
@@ -2229,8 +2229,8 @@
         <function-decl name='CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-175' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -2238,7 +2238,7 @@
         <function-decl name='~CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-175' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -2261,87 +2261,31 @@
       <member-function access='protected' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN11FlistSorter5qscmpEPcS0_' filepath='libnurbs/internals/flistsorter.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
         <function-decl name='qsexc' mangled-name='_ZN11FlistSorter5qsexcEPcS0_' filepath='libnurbs/internals/flistsorter.cc' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
         <function-decl name='qstexc' mangled-name='_ZN11FlistSorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/flistsorter.cc' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-157'>
-      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
-      <data-member access='private' static='yes'>
-        <var-decl name='ZERO' type-id='type-id-179' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2240'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='2304'>
-        <var-decl name='p' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4800'>
-        <var-decl name='stacksize' type-id='type-id-92' visibility='default' filepath='libnurbs/internals/mesher.h' line='59' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4864'>
-        <var-decl name='vdata' type-id='type-id-180' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='4928'>
-        <var-decl name='last' type-id='type-id-181' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5056'>
-        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
-      </data-member>
-      <data-member access='private' layout-offset-in-bits='5088'>
-        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
-      </data-member>
-      <member-function access='private' constructor='yes'>
-        <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-182' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='private' destructor='yes'>
-        <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-182' is-artificial='yes'/>
-          <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-164'/>
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-162'/>
-    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-166'>
-      <underlying-type type-id='type-id-9'/>
-      <enumerator name='ct_nurbscurve' value='0'/>
-      <enumerator name='ct_pwlcurve' value='1'/>
-      <enumerator name='ct_none' value='2'/>
-    </enum-decl>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-161'>
-      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
-    </array-type-def>
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-136'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
       </data-member>
@@ -2367,7 +2311,7 @@
         <var-decl name='maxtrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='bboxsize' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
+        <var-decl name='bboxsize' type-id='type-id-178' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
@@ -2388,13 +2332,13 @@
         <var-decl name='mask' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
-        <var-decl name='bmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
+        <var-decl name='bmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
-        <var-decl name='cmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
+        <var-decl name='cmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2272'>
-        <var-decl name='smat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
+        <var-decl name='smat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <var-decl name='s_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
@@ -2412,26 +2356,71 @@
         <var-decl name='bbox_subdividing' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
-        <var-decl name='next' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
+        <var-decl name='next' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3328'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-103' is-artificial='yes'/>
+          <parameter type-id='type-id-107' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-11'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-161'>
+      <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
+      <data-member access='private' static='yes'>
+        <var-decl name='ZERO' type-id='type-id-181' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2240'>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='2304'>
+        <var-decl name='p' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4800'>
+        <var-decl name='stacksize' type-id='type-id-92' visibility='default' filepath='libnurbs/internals/mesher.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4864'>
+        <var-decl name='vdata' type-id='type-id-182' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='4928'>
+        <var-decl name='last' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5056'>
+        <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='private' layout-offset-in-bits='5088'>
+        <var-decl name='lastedge' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='63' column='1'/>
+      </data-member>
+      <member-function access='private' constructor='yes'>
+        <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='private' destructor='yes'>
+        <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
+          <parameter type-id='type-id-11' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='O_nurbscurve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='70' column='1' id='type-id-137'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bezier_curves' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
+        <var-decl name='bezier_curves' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
@@ -2452,7 +2441,7 @@
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_nurbscurve' filepath='libnurbs/internals/reader.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2463,15 +2452,15 @@
       </member-function>
     </class-decl>
     <class-decl name='O_nurbssurface' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='101' column='1' id='type-id-138'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bezier_patches' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
+        <var-decl name='bezier_patches' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='next' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='105' column='1'/>
@@ -2491,7 +2480,7 @@
       </member-function>
     </class-decl>
     <class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/reader.h' line='85' column='1'/>
       </data-member>
@@ -2508,7 +2497,7 @@
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_pwlcurve' filepath='libnurbs/internals/reader.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2522,10 +2511,11 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-157'/>
     <class-decl name='Quilt' size-in-bits='896' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='64' column='1' id='type-id-140'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
@@ -2537,12 +2527,12 @@
         <var-decl name='eqspec' type-id='type-id-186' visibility='default' filepath='libnurbs/internals/quilt.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='next' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Quilt' filepath='libnurbs/internals/quilt.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-120' is-artificial='yes'/>
-          <parameter type-id='type-id-103'/>
+          <parameter type-id='type-id-125' is-artificial='yes'/>
+          <parameter type-id='type-id-107'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -2576,36 +2566,119 @@
         <var-decl name='next' type-id='type-id-132' visibility='default' filepath='libnurbs/interface/bezierPatch.h' line='63' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-175'/>
+    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-166'/>
+    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-159'>
+      <underlying-type type-id='type-id-9'/>
+      <enumerator name='ct_nurbscurve' value='0'/>
+      <enumerator name='ct_pwlcurve' value='1'/>
+      <enumerator name='ct_none' value='2'/>
+    </enum-decl>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-165'>
+      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
+    </array-type-def>
+    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-175'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-180'/>
-    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-182'/>
+    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-183'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-184'/>
     <array-type-def dimensions='1' type-id='type-id-189' size-in-bits='640' id='type-id-185'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-183'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-178'>
       <subrange length='5' type-id='type-id-3' id='type-id-190'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-191' size-in-bits='1600' id='type-id-187'>
       <subrange length='1' type-id='type-id-3' id='type-id-192'/>
     </array-type-def>
-    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
+    <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
+      <data-member access='public' static='yes'>
+        <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' static='yes'>
+        <var-decl name='arc_tag' type-id='type-id-174' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
+      </data-member>
+      <data-member access='public' static='yes'>
+        <var-decl name='tail_tag' type-id='type-id-174' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='prev' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='next' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='link' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='bezierArc' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='pwlArc' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='384'>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <parameter type-id='type-id-167'/>
+          <parameter type-id='type-id-194'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-167' is-artificial='yes'/>
+          <parameter type-id='type-id-195'/>
+          <parameter type-id='type-id-15'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='work' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='192'>
+        <var-decl name='cleanup' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='320'>
+        <var-decl name='next' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='53' column='1'/>
+      </data-member>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
+          <parameter type-id='type-id-152' is-artificial='yes'/>
+          <parameter type-id='type-id-196'/>
+          <parameter type-id='type-id-25'/>
+          <parameter type-id='type-id-196'/>
+          <return type-id='type-id-12'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-180'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <member-type access='private'>
-        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-193'>
+        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-197'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='left' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
+            <var-decl name='left' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='line' type-id='type-id-195' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
+            <var-decl name='line' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='right' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
+            <var-decl name='right' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='index' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
@@ -2613,30 +2686,30 @@
         </class-decl>
       </member-type>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='lower' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
+        <var-decl name='lower' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='upper' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
+        <var-decl name='upper' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <var-decl name='fakeleft' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
+        <var-decl name='fakeleft' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
-        <var-decl name='fakeright' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
+        <var-decl name='fakeright' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Hull' filepath='libnurbs/internals/hull.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Hull' filepath='libnurbs/internals/hull.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -2647,169 +2720,139 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Sorter' filepath='libnurbs/internals/sorter.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~Sorter' filepath='libnurbs/internals/sorter.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN6Sorter5qscmpEPcS0_' filepath='libnurbs/internals/sorter.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
         <function-decl name='qsexc' mangled-name='_ZN6Sorter5qsexcEPcS0_' filepath='libnurbs/internals/sorter.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
         <function-decl name='qstexc' mangled-name='_ZN6Sorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/sorter.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='TrimRegion' size-in-bits='2560' visibility='default' filepath='libnurbs/internals/trimregion.h' line='46' column='1' id='type-id-173'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='left' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
+        <var-decl name='left' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <var-decl name='right' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
+        <var-decl name='right' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='top' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
+        <var-decl name='top' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1984'>
-        <var-decl name='bot' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
+        <var-decl name='bot' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
-        <var-decl name='uarray' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
+        <var-decl name='uarray' type-id='type-id-204' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-201' is-artificial='yes'/>
+          <parameter type-id='type-id-205' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
-    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
-    <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
-      <data-member access='public' static='yes'>
-        <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' static='yes'>
-        <var-decl name='arc_tag' type-id='type-id-174' mangled-name='_ZN3Arc7arc_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='59' column='1'/>
+    <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-172'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='param' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
-      <data-member access='public' static='yes'>
-        <var-decl name='tail_tag' type-id='type-id-174' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
+    </class-decl>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-181'/>
+    <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
+    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-179'/>
+    <typedef-decl name='Quiltspec_ptr' type-id='type-id-207' filepath='libnurbs/internals/quilt.h' line='62' column='1' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-193'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-199'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-207'/>
+    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-206'>
+      <subrange length='5' type-id='type-id-3' id='type-id-190'/>
+      <subrange length='5' type-id='type-id-3' id='type-id-190'/>
+    </array-type-def>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-198'/>
+    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-203'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='prev' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
+        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
+        <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='link' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
+        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='bezierArc' type-id='type-id-202' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
+        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pwlArc' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='67' column='1'/>
+        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-167' is-artificial='yes'/>
-          <parameter type-id='type-id-167'/>
-          <parameter type-id='type-id-203'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-167' is-artificial='yes'/>
-          <parameter type-id='type-id-204'/>
-          <parameter type-id='type-id-15'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
     </class-decl>
-    <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+    <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-189'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='work' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
+        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='cleanup' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='next' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='53' column='1'/>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
       </data-member>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-152' is-artificial='yes'/>
-          <parameter type-id='type-id-205'/>
-          <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-205'/>
-          <return type-id='type-id-12'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-172'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='param' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+      <data-member access='public' layout-offset-in-bits='128'>
+        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
+      <data-member access='public' layout-offset-in-bits='160'>
+        <var-decl name='bdry' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='224'>
+        <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='256'>
+        <var-decl name='breakpoints' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-184'/>
-    <typedef-decl name='Quiltspec_ptr' type-id='type-id-207' filepath='libnurbs/internals/quilt.h' line='62' column='1' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-195'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-207'/>
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-206'>
-      <subrange length='5' type-id='type-id-3' id='type-id-190'/>
-      <subrange length='5' type-id='type-id-3' id='type-id-190'/>
-    </array-type-def>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-194'/>
-    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-196'>
+    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-200'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimline.h' line='48' column='1'/>
       </data-member>
@@ -2823,7 +2866,7 @@
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='jarcl' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
+        <var-decl name='jarcl' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <var-decl name='t' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/trimline.h' line='53' column='1'/>
@@ -2839,19 +2882,19 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Trimline' filepath='libnurbs/internals/trimline.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Trimline' filepath='libnurbs/internals/trimline.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-200'>
+    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-204'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
@@ -2863,69 +2906,18 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Uarray' filepath='libnurbs/internals/uarray.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Uarray' filepath='libnurbs/internals/uarray.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-204'>
-      <underlying-type type-id='type-id-9'/>
-      <enumerator name='arc_none' value='0'/>
-      <enumerator name='arc_right' value='1'/>
-      <enumerator name='arc_top' value='2'/>
-      <enumerator name='arc_left' value='3'/>
-      <enumerator name='arc_bottom' value='4'/>
-    </enum-decl>
-    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-199'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='vval' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/gridline.h' line='41' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='vindex' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='42' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='ustart' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='Quiltspec' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='51' column='1' id='type-id-189'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='52' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='width' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='53' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='offset' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='54' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='order' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='55' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='bdry' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='breakpoints' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
-      </data-member>
-    </class-decl>
     <class-decl name='__jmp_buf_tag' size-in-bits='1600' is-struct='yes' visibility='default' filepath='/usr/include/setjmp.h' line='36' column='1' id='type-id-191'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__jmpbuf' type-id='type-id-215' visibility='default' filepath='/usr/include/setjmp.h' line='41' column='1'/>
@@ -2937,11 +2929,20 @@
         <var-decl name='__saved_mask' type-id='type-id-216' visibility='default' filepath='/usr/include/setjmp.h' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-205'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-214'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
+    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-195'>
+      <underlying-type type-id='type-id-9'/>
+      <enumerator name='arc_none' value='0'/>
+      <enumerator name='arc_right' value='1'/>
+      <enumerator name='arc_top' value='2'/>
+      <enumerator name='arc_left' value='3'/>
+      <enumerator name='arc_bottom' value='4'/>
+    </enum-decl>
+    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-214'/>
+    <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-208'/>
     <class-decl name='GridTrimVertex' size-in-bits='384' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='45' column='1' id='type-id-209'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='dummyt' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='47' column='1'/>
       </data-member>
@@ -2961,9 +2962,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
+    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-213'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='arc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
+        <var-decl name='arc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='p' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='44' column='1'/>
@@ -2973,7 +2974,7 @@
       </data-member>
     </class-decl>
     <class-decl name='PwlArc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='44' column='1' id='type-id-210'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='46' column='1'/>
       </data-member>
@@ -2985,13 +2986,13 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-141'/>
           <return type-id='type-id-12'/>
@@ -2999,7 +3000,7 @@
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-141'/>
           <parameter type-id='type-id-15'/>
@@ -3007,11 +3008,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-213'>
-      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
-    </array-type-def>
-    <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-208'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__pfn' type-id='type-id-221' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
@@ -3019,15 +3016,15 @@
         <var-decl name='__delta' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
     </class-decl>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-211'>
+      <subrange length='2' type-id='type-id-3' id='type-id-64'/>
+    </array-type-def>
     <typedef-decl name='__jmp_buf' type-id='type-id-222' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-215'/>
     <typedef-decl name='__sigset_t' type-id='type-id-223' filepath='/usr/include/bits/sigset.h' line='32' column='1' id='type-id-216'/>
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
-      <subrange length='8' type-id='type-id-3' id='type-id-224'/>
-    </array-type-def>
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-219'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gparam' type-id='type-id-161' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
+        <var-decl name='gparam' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='GridVertex' filepath='libnurbs/internals/gridvertex.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3046,12 +3043,15 @@
     </class-decl>
     <class-decl name='__anonymous_struct__2' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-223'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__val' type-id='type-id-225' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
+        <var-decl name='__val' type-id='type-id-224' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
       </data-member>
     </class-decl>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
+      <subrange length='8' type-id='type-id-3' id='type-id-225'/>
+    </array-type-def>
     <typedef-decl name='Knot' type-id='type-id-1' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-218'/>
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-221'/>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-225'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-224'>
       <subrange length='16' type-id='type-id-3' id='type-id-227'/>
     </array-type-def>
   </abi-instr>
@@ -3062,46 +3062,46 @@
     <typedef-decl name='errorCallbackType' type-id='type-id-19' filepath='libnurbs/interface/glrenderer.h' line='46' column='1' id='type-id-44'/>
     <class-decl name='NurbsTessellator' size-in-bits='47616' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='53' column='1' id='type-id-43'>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='renderhints' type-id='type-id-70' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='104' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='320'>
-        <var-decl name='maplist' type-id='type-id-71' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
+        <var-decl name='maplist' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='105' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='3008'>
-        <var-decl name='backend' type-id='type-id-72' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
+        <var-decl name='backend' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='106' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3648'>
-        <var-decl name='subdivider' type-id='type-id-73' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
+        <var-decl name='subdivider' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='134' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24064'>
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='135' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='24128'>
-        <var-decl name='o_pwlcurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
+        <var-decl name='o_pwlcurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='136' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='26624'>
-        <var-decl name='o_nurbscurvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
+        <var-decl name='o_nurbscurvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='137' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='29120'>
-        <var-decl name='o_curvePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
+        <var-decl name='o_curvePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='31616'>
-        <var-decl name='o_trimPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
+        <var-decl name='o_trimPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='139' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='34112'>
-        <var-decl name='o_surfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
+        <var-decl name='o_surfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='140' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='36608'>
-        <var-decl name='o_nurbssurfacePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
+        <var-decl name='o_nurbssurfacePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='141' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='39104'>
-        <var-decl name='propertyPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
+        <var-decl name='propertyPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='142' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='41600'>
-        <var-decl name='quiltPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
+        <var-decl name='quiltPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='144' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='44096'>
-        <var-decl name='extTrimVertexPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
+        <var-decl name='extTrimVertexPool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='146' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='46720'>
         <var-decl name='inSurface' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='148' column='1'/>
@@ -3131,75 +3131,75 @@
         <var-decl name='playBack' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='156' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47040'>
-        <var-decl name='nextTrim' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
+        <var-decl name='nextTrim' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='158' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47104'>
-        <var-decl name='nextCurve' type-id='type-id-78' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
+        <var-decl name='nextCurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='159' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47168'>
-        <var-decl name='nextNurbscurve' type-id='type-id-79' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
+        <var-decl name='nextNurbscurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='160' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47232'>
-        <var-decl name='nextPwlcurve' type-id='type-id-80' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
+        <var-decl name='nextPwlcurve' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='161' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47296'>
-        <var-decl name='nextNurbssurface' type-id='type-id-81' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
+        <var-decl name='nextNurbssurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='162' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47360'>
-        <var-decl name='currentSurface' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
+        <var-decl name='currentSurface' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='164' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47424'>
-        <var-decl name='currentTrim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
+        <var-decl name='currentTrim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='165' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47488'>
-        <var-decl name='currentCurve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
+        <var-decl name='currentCurve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='166' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='47552'>
-        <var-decl name='dl' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
+        <var-decl name='dl' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/nurbstess.h' line='168' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
-          <parameter type-id='type-id-87'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <parameter type-id='type-id-88'/>
+          <parameter type-id='type-id-89'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~NurbsTessellator' filepath='libnurbs/internals/nurbsinterfac.cc' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='2'>
         <function-decl name='bgnrender' mangled-name='_ZN16NurbsTessellator9bgnrenderEv' filepath='libnurbs/internals/nurbstess.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <function-decl name='endrender' mangled-name='_ZN16NurbsTessellator9endrenderEv' filepath='libnurbs/internals/nurbstess.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <function-decl name='makeobj' mangled-name='_ZN16NurbsTessellator7makeobjEi' filepath='libnurbs/internals/nurbstess.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='5'>
         <function-decl name='closeobj' mangled-name='_ZN16NurbsTessellator8closeobjEv' filepath='libnurbs/internals/nurbstess.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='6'>
         <function-decl name='errorHandler' mangled-name='_ZN16NurbsTessellator12errorHandlerEi' filepath='libnurbs/internals/nurbstess.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3211,7 +3211,7 @@
     <array-type-def dimensions='1' type-id='type-id-63' size-in-bits='64' id='type-id-50'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-160'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='64' id='type-id-164'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='96' id='type-id-230'>
@@ -3227,7 +3227,7 @@
     <array-type-def dimensions='1' type-id='type-id-67' size-in-bits='192' id='type-id-49'>
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-161'>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-165'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <class-decl name='StoredVertex' size-in-bits='256' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='84' column='1' id='type-id-102'>
@@ -3235,10 +3235,10 @@
         <var-decl name='type' type-id='type-id-11' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='95' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='32'>
-        <var-decl name='coord' type-id='type-id-160' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
+        <var-decl name='coord' type-id='type-id-164' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='96' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <var-decl name='point' type-id='type-id-161' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
+        <var-decl name='point' type-id='type-id-165' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='97' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='StoredVertex' filepath='libnurbs/interface/glsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3258,14 +3258,14 @@
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-7'/>
       <member-function access='public' destructor='yes' vtable-offset='-1'>
         <function-decl name='~BasicSurfaceEvaluator' filepath='libnurbs/internals/basicsurfeval.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='9'>
         <function-decl name='range2f' mangled-name='_ZN21BasicSurfaceEvaluator7range2fElPfS0_' filepath='libnurbs/internals/basicsurfeval.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-16'/>
@@ -3274,7 +3274,7 @@
       </member-function>
       <member-function access='public' vtable-offset='10'>
         <function-decl name='domain2f' mangled-name='_ZN21BasicSurfaceEvaluator8domain2fEffff' filepath='libnurbs/internals/basicsurfeval.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -3284,28 +3284,28 @@
       </member-function>
       <member-function access='public' vtable-offset='11'>
         <function-decl name='enable' mangled-name='_ZN21BasicSurfaceEvaluator6enableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='12'>
         <function-decl name='disable' mangled-name='_ZN21BasicSurfaceEvaluator7disableEl' filepath='libnurbs/internals/basicsurfeval.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='13'>
         <function-decl name='bgnmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8bgnmap2fEl' filepath='libnurbs/internals/basicsurfeval.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='14'>
         <function-decl name='map2f' mangled-name='_ZN21BasicSurfaceEvaluator5map2fElffllffllPf' filepath='libnurbs/internals/basicsurfeval.cc' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -3321,7 +3321,7 @@
       </member-function>
       <member-function access='public' vtable-offset='15'>
         <function-decl name='mapgrid2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapgrid2fElfflff' filepath='libnurbs/internals/basicsurfeval.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -3333,7 +3333,7 @@
       </member-function>
       <member-function access='public' vtable-offset='16'>
         <function-decl name='mapmesh2f' mangled-name='_ZN21BasicSurfaceEvaluator9mapmesh2fElllll' filepath='libnurbs/internals/basicsurfeval.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
@@ -3344,7 +3344,7 @@
       </member-function>
       <member-function access='public' vtable-offset='17'>
         <function-decl name='evalcoord2f' mangled-name='_ZN21BasicSurfaceEvaluator11evalcoord2fElff' filepath='libnurbs/internals/basicsurfeval.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
@@ -3353,7 +3353,7 @@
       </member-function>
       <member-function access='public' vtable-offset='18'>
         <function-decl name='evalpoint2i' mangled-name='_ZN21BasicSurfaceEvaluator11evalpoint2iEll' filepath='libnurbs/internals/basicsurfeval.cc' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
@@ -3361,86 +3361,86 @@
       </member-function>
       <member-function access='public' vtable-offset='19'>
         <function-decl name='endmap2f' mangled-name='_ZN21BasicSurfaceEvaluator8endmap2fEv' filepath='libnurbs/internals/basicsurfeval.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='20'>
         <function-decl name='polymode' mangled-name='_ZN21BasicSurfaceEvaluator8polymodeEl' filepath='libnurbs/internals/basicsurfeval.cc' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='21'>
         <function-decl name='bgnline' mangled-name='_ZN21BasicSurfaceEvaluator7bgnlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='22'>
         <function-decl name='endline' mangled-name='_ZN21BasicSurfaceEvaluator7endlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='23'>
         <function-decl name='bgnclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13bgnclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='24'>
         <function-decl name='endclosedline' mangled-name='_ZN21BasicSurfaceEvaluator13endclosedlineEv' filepath='libnurbs/internals/basicsurfeval.cc' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='25'>
         <function-decl name='bgntmesh' mangled-name='_ZN21BasicSurfaceEvaluator8bgntmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='26'>
         <function-decl name='swaptmesh' mangled-name='_ZN21BasicSurfaceEvaluator9swaptmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='27'>
         <function-decl name='endtmesh' mangled-name='_ZN21BasicSurfaceEvaluator8endtmeshEv' filepath='libnurbs/internals/basicsurfeval.cc' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='28'>
         <function-decl name='bgnqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9bgnqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='29'>
         <function-decl name='endqstrip' mangled-name='_ZN21BasicSurfaceEvaluator9endqstripEv' filepath='libnurbs/internals/basicsurfeval.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='30'>
         <function-decl name='bgntfan' mangled-name='_ZN21BasicSurfaceEvaluator7bgntfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='31'>
         <function-decl name='endtfan' mangled-name='_ZN21BasicSurfaceEvaluator7endtfanEv' filepath='libnurbs/internals/basicsurfeval.cc' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='32'>
         <function-decl name='evalUStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalUStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -3452,7 +3452,7 @@
       </member-function>
       <member-function access='public' vtable-offset='33'>
         <function-decl name='evalVStrip' mangled-name='_ZN21BasicSurfaceEvaluator10evalVStripEifPfifS0_' filepath='libnurbs/internals/basicsurfeval.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -3464,7 +3464,7 @@
       </member-function>
       <member-function access='public' vtable-offset='34'>
         <function-decl name='inDoEvalCoord2NOGE' mangled-name='_ZN21BasicSurfaceEvaluator18inDoEvalCoord2NOGEEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -3474,7 +3474,7 @@
       </member-function>
       <member-function access='public' vtable-offset='35'>
         <function-decl name='inDoEvalCoord2NOGE_BU' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BUEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -3484,7 +3484,7 @@
       </member-function>
       <member-function access='public' vtable-offset='36'>
         <function-decl name='inDoEvalCoord2NOGE_BV' mangled-name='_ZN21BasicSurfaceEvaluator21inDoEvalCoord2NOGE_BVEffPfS0_' filepath='libnurbs/internals/basicsurfeval.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-16'/>
@@ -3494,14 +3494,14 @@
       </member-function>
       <member-function access='public' vtable-offset='37'>
         <function-decl name='inPreEvaluateBV_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBV_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' vtable-offset='38'>
         <function-decl name='inPreEvaluateBU_intfac' mangled-name='_ZN21BasicSurfaceEvaluator22inPreEvaluateBU_intfacEf' filepath='libnurbs/internals/basicsurfeval.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-90' is-artificial='yes'/>
+          <parameter type-id='type-id-70' is-artificial='yes'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3645,7 +3645,7 @@
         <var-decl name='next' type-id='type-id-51' visibility='default' filepath='libnurbs/interface/bezierPatchMesh.h' line='65' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-70'/>
     <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-134'/>
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-233'/>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-67'/>
@@ -3661,11 +3661,11 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <type-decl name='char' size-in-bits='8' id='type-id-143'/>
-    <array-type-def dimensions='1' type-id='type-id-111' size-in-bits='2048' id='type-id-110'>
+    <array-type-def dimensions='1' type-id='type-id-115' size-in-bits='2048' id='type-id-114'>
       <subrange length='32' type-id='type-id-3' id='type-id-144'/>
     </array-type-def>
     <class-decl name='Arc' size-in-bits='448' is-struct='yes' visibility='default' filepath='libnurbs/internals/arc.h' line='55' column='1' id='type-id-168'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' static='yes'>
         <var-decl name='bezier_tag' type-id='type-id-174' mangled-name='_ZN3Arc10bezier_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='58' column='1'/>
       </data-member>
@@ -3676,19 +3676,19 @@
         <var-decl name='tail_tag' type-id='type-id-174' mangled-name='_ZN3Arc8tail_tagE' visibility='default' filepath='libnurbs/internals/arc.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='prev' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
+        <var-decl name='prev' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
+        <var-decl name='next' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='link' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
+        <var-decl name='link' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/arc.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='bezierArc' type-id='type-id-202' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
+        <var-decl name='bezierArc' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/arc.h' line='64' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='pwlArc' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
+        <var-decl name='pwlArc' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/arc.h' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/arc.h' line='66' column='1'/>
@@ -3700,38 +3700,38 @@
         <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-167' is-artificial='yes'/>
           <parameter type-id='type-id-167'/>
-          <parameter type-id='type-id-203'/>
+          <parameter type-id='type-id-194'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='Arc' filepath='libnurbs/internals/arc.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-167' is-artificial='yes'/>
-          <parameter type-id='type-id-204'/>
+          <parameter type-id='type-id-195'/>
           <parameter type-id='type-id-15'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-75'>
+    <class-decl name='Pool' size-in-bits='2496' visibility='default' filepath='libnurbs/internals/bufpool.h' line='50' column='1' id='type-id-76'>
       <member-type access='protected'>
-        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-108'>
+        <enum-decl name='Magic' filepath='libnurbs/internals/bufpool.h' line='70' column='1' id='type-id-112'>
           <underlying-type type-id='type-id-9'/>
           <enumerator name='is_allocated' value='62369'/>
           <enumerator name='is_free' value='61858'/>
         </enum-decl>
       </member-type>
       <data-member access='protected' layout-offset-in-bits='0'>
-        <var-decl name='freelist' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
+        <var-decl name='freelist' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='62' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='64'>
-        <var-decl name='blocklist' type-id='type-id-110' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
+        <var-decl name='blocklist' type-id='type-id-114' visibility='default' filepath='libnurbs/internals/bufpool.h' line='63' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2112'>
         <var-decl name='nextblock' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='64' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2176'>
-        <var-decl name='curblock' type-id='type-id-111' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
+        <var-decl name='curblock' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/bufpool.h' line='65' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2240'>
         <var-decl name='buffersize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='66' column='1'/>
@@ -3746,23 +3746,23 @@
         <var-decl name='initsize' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/bufpool.h' line='69' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2368'>
-        <var-decl name='name' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
+        <var-decl name='name' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/bufpool.h' line='71' column='1'/>
       </data-member>
       <data-member access='protected' layout-offset-in-bits='2432'>
-        <var-decl name='magic' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
+        <var-decl name='magic' type-id='type-id-112' visibility='default' filepath='libnurbs/internals/bufpool.h' line='72' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Pool' filepath='libnurbs/internals/bufpool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-11'/>
-          <parameter type-id='type-id-112'/>
+          <parameter type-id='type-id-116'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Pool' filepath='libnurbs/internals/bufpool.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-113' is-artificial='yes'/>
+          <parameter type-id='type-id-117' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
@@ -3771,20 +3771,20 @@
     <typedef-decl name='size_t' type-id='type-id-3' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h' line='211' column='1' id='type-id-238'/>
     <class-decl name='Buffer' size-in-bits='64' visibility='default' filepath='libnurbs/internals/bufpool.h' line='45' column='1' id='type-id-135'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
+        <var-decl name='next' type-id='type-id-113' visibility='default' filepath='libnurbs/internals/bufpool.h' line='47' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-164'/>
+    <class-decl name='PooledObj' size-in-bits='8' visibility='default' filepath='libnurbs/internals/bufpool.h' line='118' column='1' id='type-id-157'/>
     <class-decl name='TrimVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='43' column='1' id='type-id-172'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='param' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
+        <var-decl name='param' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='nuid' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimvertex.h' line='50' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-119'/>
-    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-204'>
+    <typedef-decl name='Arc_ptr' type-id='type-id-167' filepath='libnurbs/internals/arc.h' line='50' column='1' id='type-id-124'/>
+    <enum-decl name='arc_side' filepath='libnurbs/internals/arc.h' line='52' column='1' id='type-id-195'>
       <underlying-type type-id='type-id-9'/>
       <enumerator name='arc_none' value='0'/>
       <enumerator name='arc_right' value='1'/>
@@ -3793,7 +3793,7 @@
       <enumerator name='arc_bottom' value='4'/>
     </enum-decl>
     <class-decl name='PwlArc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='44' column='1' id='type-id-210'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/pwlarc.h' line='46' column='1'/>
       </data-member>
@@ -3805,13 +3805,13 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-141'/>
           <return type-id='type-id-12'/>
@@ -3819,7 +3819,7 @@
       </member-function>
       <member-function access='private' constructor='yes'>
         <function-decl name='PwlArc' filepath='libnurbs/internals/pwlarc.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-203' is-artificial='yes'/>
+          <parameter type-id='type-id-194' is-artificial='yes'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-141'/>
           <parameter type-id='type-id-15'/>
@@ -3829,21 +3829,21 @@
     </class-decl>
     <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-167'/>
     <qualified-type-def type-id='type-id-167' const='yes' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
-    <reference-type-def kind='lvalue' type-id='type-id-75' size-in-bits='64' id='type-id-150'/>
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-193'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-113'/>
+    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-117'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-111'/>
-    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-115'/>
+    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-116'/>
     <qualified-type-def type-id='type-id-11' const='yes' id='type-id-174'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-122'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='128' id='type-id-127'>
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
     <array-type-def dimensions='3' type-id='type-id-1' size-in-bits='infinite' id='type-id-145'>
@@ -3851,7 +3851,7 @@
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
       <subrange length='24' type-id='type-id-3' id='type-id-171'/>
     </array-type-def>
-    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-70'>
+    <class-decl name='Renderhints' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/renderhints.h' line='41' column='1' id='type-id-71'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='display_method' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/renderhints.h' line='49' column='1'/>
       </data-member>
@@ -3878,7 +3878,7 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Renderhints' filepath='libnurbs/internals/renderhints.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-129' is-artificial='yes'/>
+          <parameter type-id='type-id-118' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -3889,40 +3889,40 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Sorter' filepath='libnurbs/internals/sorter.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes' vtable-offset='-1'>
         <function-decl name='~Sorter' filepath='libnurbs/internals/sorter.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN6Sorter5qscmpEPcS0_' filepath='libnurbs/internals/sorter.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
         <function-decl name='qsexc' mangled-name='_ZN6Sorter5qsexcEPcS0_' filepath='libnurbs/internals/sorter.cc' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
         <function-decl name='qstexc' mangled-name='_ZN6Sorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/sorter.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-198' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-202' is-artificial='yes'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -3942,25 +3942,25 @@
       <member-function access='protected' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN9ArcSorter5qscmpEPcS0_' filepath='libnurbs/internals/arcsorter.cc' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-244' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='3'>
         <function-decl name='qsexc' mangled-name='_ZN9ArcSorter5qsexcEPcS0_' filepath='libnurbs/internals/arcsorter.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-244' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' vtable-offset='4'>
         <function-decl name='qstexc' mangled-name='_ZN9ArcSorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/arcsorter.cc' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-244' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -3983,32 +3983,32 @@
       <member-function access='protected' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN11FlistSorter5qscmpEPcS0_' filepath='libnurbs/internals/flistsorter.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='3'>
         <function-decl name='qsexc' mangled-name='_ZN11FlistSorter5qsexcEPcS0_' filepath='libnurbs/internals/flistsorter.cc' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='protected' vtable-offset='4'>
         <function-decl name='qstexc' mangled-name='_ZN11FlistSorter6qstexcEPcS0_S0_' filepath='libnurbs/internals/flistsorter.cc' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-177' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-76'>
+    <class-decl name='TrimVertexPool' size-in-bits='2624' is-struct='yes' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='45' column='1' id='type-id-77'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='pool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
+        <var-decl name='pool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <var-decl name='vlist' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimvertpool.h' line='53' column='1'/>
@@ -4034,9 +4034,9 @@
       </member-function>
     </class-decl>
     <class-decl name='Quilt' size-in-bits='896' is-struct='yes' visibility='default' filepath='libnurbs/internals/quilt.h' line='64' column='1' id='type-id-140'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/quilt.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cpts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/quilt.h' line='68' column='1'/>
@@ -4048,22 +4048,22 @@
         <var-decl name='eqspec' type-id='type-id-186' visibility='default' filepath='libnurbs/internals/quilt.h' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='next' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
+        <var-decl name='next' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/quilt.h' line='71' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Quilt' filepath='libnurbs/internals/quilt.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-120' is-artificial='yes'/>
-          <parameter type-id='type-id-103'/>
+          <parameter type-id='type-id-125' is-artificial='yes'/>
+          <parameter type-id='type-id-107'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-118'>
+    <class-decl name='Bin' size-in-bits='128' visibility='default' filepath='libnurbs/internals/bin.h' line='44' column='1' id='type-id-123'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
+        <var-decl name='head' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='46' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='current' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
+        <var-decl name='current' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/bin.h' line='47' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Bin' filepath='libnurbs/internals/bin.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4079,7 +4079,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-116'>
+    <class-decl name='ArcTessellator' size-in-bits='128' visibility='default' filepath='libnurbs/internals/arctess.h' line='47' column='1' id='type-id-121'>
       <data-member access='private' static='yes'>
         <var-decl name='gl_Bernstein' type-id='type-id-145' mangled-name='_ZN14ArcTessellator12gl_BernsteinE' visibility='default' filepath='libnurbs/internals/arctess.h' line='60' column='1'/>
       </data-member>
@@ -4121,7 +4121,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Curvelist' filepath='libnurbs/internals/curvelist.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-249' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <return type-id='type-id-12'/>
@@ -4143,12 +4143,12 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-72'>
+    <class-decl name='Backend' size-in-bits='640' is-struct='yes' visibility='default' filepath='libnurbs/internals/backend.h' line='46' column='1' id='type-id-73'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='curveEvaluator' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
+        <var-decl name='curveEvaluator' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/backend.h' line='48' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='surfaceEvaluator' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
+        <var-decl name='surfaceEvaluator' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/backend.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='wireframetris' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='105' column='1'/>
@@ -4160,23 +4160,23 @@
         <var-decl name='npts' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='107' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='224'>
-        <var-decl name='mesh' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
+        <var-decl name='mesh' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/backend.h' line='108' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='608'>
         <var-decl name='meshindex' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/backend.h' line='109' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Backend' filepath='libnurbs/internals/backend.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-128' is-artificial='yes'/>
-          <parameter type-id='type-id-87'/>
+          <parameter type-id='type-id-106' is-artificial='yes'/>
           <parameter type-id='type-id-88'/>
+          <parameter type-id='type-id-89'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-73'>
+    <class-decl name='Subdivider' size-in-bits='20416' visibility='default' filepath='libnurbs/internals/subdivider.h' line='55' column='1' id='type-id-74'>
       <member-type access='private'>
-        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-114'>
+        <enum-decl name='dir' filepath='libnurbs/internals/subdivider.h' line='105' column='1' id='type-id-119'>
           <underlying-type type-id='type-id-9'/>
           <enumerator name='down' value='0'/>
           <enumerator name='same' value='1'/>
@@ -4185,37 +4185,37 @@
         </enum-decl>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='slicer' type-id='type-id-115' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
+        <var-decl name='slicer' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8064'>
-        <var-decl name='arctessellator' type-id='type-id-116' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
+        <var-decl name='arctessellator' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='113' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8192'>
-        <var-decl name='arcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
+        <var-decl name='arcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='114' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='10688'>
-        <var-decl name='bezierarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
+        <var-decl name='bezierarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='13184'>
-        <var-decl name='pwlarcpool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
+        <var-decl name='pwlarcpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='116' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='15680'>
-        <var-decl name='trimvertexpool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
+        <var-decl name='trimvertexpool' type-id='type-id-77' visibility='default' filepath='libnurbs/internals/subdivider.h' line='117' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18304'>
-        <var-decl name='jumpbuffer' type-id='type-id-74' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
+        <var-decl name='jumpbuffer' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/subdivider.h' line='119' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18368'>
-        <var-decl name='renderhints' type-id='type-id-117' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
+        <var-decl name='renderhints' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18432'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/subdivider.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18496'>
-        <var-decl name='initialbin' type-id='type-id-118' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
+        <var-decl name='initialbin' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/subdivider.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18624'>
-        <var-decl name='pjarc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
+        <var-decl name='pjarc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/subdivider.h' line='124' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18688'>
         <var-decl name='s_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='125' column='1'/>
@@ -4224,22 +4224,22 @@
         <var-decl name='t_index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='126' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18752'>
-        <var-decl name='qlist' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
+        <var-decl name='qlist' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/subdivider.h' line='127' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='18816'>
-        <var-decl name='spbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
+        <var-decl name='spbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19136'>
-        <var-decl name='tpbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
+        <var-decl name='tpbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19456'>
-        <var-decl name='smbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
+        <var-decl name='smbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='130' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='19776'>
-        <var-decl name='tmbrkpts' type-id='type-id-121' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
+        <var-decl name='tmbrkpts' type-id='type-id-126' visibility='default' filepath='libnurbs/internals/subdivider.h' line='131' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20096'>
-        <var-decl name='stepsizes' type-id='type-id-122' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
+        <var-decl name='stepsizes' type-id='type-id-127' visibility='default' filepath='libnurbs/internals/subdivider.h' line='132' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='20224'>
         <var-decl name='showDegenerate' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/subdivider.h' line='133' column='1'/>
@@ -4258,21 +4258,21 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Subdivider' filepath='libnurbs/internals/subdivider.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-123' is-artificial='yes'/>
-          <parameter type-id='type-id-124'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
+          <parameter type-id='type-id-129'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Subdivider' filepath='libnurbs/internals/subdivider.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-123' is-artificial='yes'/>
+          <parameter type-id='type-id-128' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-121'>
+    <class-decl name='Flist' size-in-bits='320' visibility='default' filepath='libnurbs/internals/flist.h' line='42' column='1' id='type-id-126'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-16' visibility='default' filepath='libnurbs/internals/flist.h' line='44' column='1'/>
       </data-member>
@@ -4314,8 +4314,8 @@
       <member-function access='private' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN13ArcSdirSorter5qscmpEPcS0_' filepath='libnurbs/internals/arcsorter.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-252' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
@@ -4332,8 +4332,8 @@
       <member-function access='private' vtable-offset='2'>
         <function-decl name='qscmp' mangled-name='_ZN13ArcTdirSorter5qscmpEPcS0_' filepath='libnurbs/internals/arcsorter.cc' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-254' is-artificial='yes'/>
-          <parameter type-id='type-id-111'/>
-          <parameter type-id='type-id-111'/>
+          <parameter type-id='type-id-115'/>
+          <parameter type-id='type-id-115'/>
           <return type-id='type-id-11'/>
         </function-decl>
       </member-function>
@@ -4354,7 +4354,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Patchlist' filepath='libnurbs/internals/patchlist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-258' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-16'/>
           <return type-id='type-id-12'/>
@@ -4377,11 +4377,11 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-115'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
-      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-157'/>
+    <class-decl name='Slicer' size-in-bits='8064' visibility='default' filepath='libnurbs/internals/slicer.h' line='49' column='1' id='type-id-120'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
+      <base-class access='public' layout-offset-in-bits='128' type-id='type-id-161'/>
       <data-member access='private' layout-offset-in-bits='5248'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/slicer.h' line='72' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5312'>
         <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/slicer.h' line='73' column='1'/>
@@ -4403,25 +4403,25 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Slicer' filepath='libnurbs/internals/slicer.cc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Slicer' filepath='libnurbs/internals/slicer.cc' line='1192' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='JumpBuffer' size-in-bits='1600' is-struct='yes' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='56' column='1' id='type-id-95'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buf' type-id='type-id-163' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
+        <var-decl name='buf' type-id='type-id-156' visibility='default' filepath='libnurbs/internals/mysetjmp.h' line='57' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-260'/>
@@ -4429,27 +4429,27 @@
     <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-244'/>
     <qualified-type-def type-id='type-id-244' const='yes' id='type-id-261'/>
     <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-148'/>
-    <qualified-type-def type-id='type-id-107' id='type-id-105'/>
-    <reference-type-def kind='lvalue' type-id='type-id-72' size-in-bits='64' id='type-id-107'/>
-    <reference-type-def kind='lvalue' type-id='type-id-118' size-in-bits='64' id='type-id-262'/>
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-148'/>
+    <qualified-type-def type-id='type-id-111' id='type-id-109'/>
+    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-111'/>
+    <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-151'/>
     <reference-type-def kind='lvalue' type-id='type-id-246' size-in-bits='64' id='type-id-250'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-155'/>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-74'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-75'/>
     <reference-type-def kind='lvalue' type-id='type-id-255' size-in-bits='64' id='type-id-259'/>
     <qualified-type-def type-id='type-id-150' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-120'/>
-    <qualified-type-def type-id='type-id-124' id='type-id-117'/>
-    <reference-type-def kind='lvalue' type-id='type-id-70' size-in-bits='64' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-125'/>
+    <qualified-type-def type-id='type-id-129' id='type-id-122'/>
+    <reference-type-def kind='lvalue' type-id='type-id-71' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-202'/>
     <qualified-type-def type-id='type-id-245' id='type-id-243'/>
-    <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-123'/>
+    <reference-type-def kind='lvalue' type-id='type-id-74' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-128'/>
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-130'/>
     <qualified-type-def type-id='type-id-149' id='type-id-147'/>
-    <reference-type-def kind='lvalue' type-id='type-id-76' size-in-bits='64' id='type-id-149'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-131'/>
+    <reference-type-def kind='lvalue' type-id='type-id-77' size-in-bits='64' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-131'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-263'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-247'/>
@@ -4467,7 +4467,7 @@
         <var-decl name='next' type-id='type-id-247' visibility='default' filepath='libnurbs/internals/curve.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
@@ -4499,7 +4499,7 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Curve' filepath='libnurbs/internals/curve.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-247' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-247'/>
@@ -4518,7 +4518,7 @@
     </class-decl>
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-266'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='next' type-id='type-id-256' visibility='default' filepath='libnurbs/internals/patch.h' line='83' column='1'/>
@@ -4550,7 +4550,7 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Patch' filepath='libnurbs/internals/patch.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-256' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-256'/>
@@ -4573,7 +4573,7 @@
         <var-decl name='range' type-id='type-id-230' visibility='default' filepath='libnurbs/internals/patch.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='sidestep' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
+        <var-decl name='sidestep' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='stepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/patch.h' line='49' column='1'/>
@@ -4612,16 +4612,16 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/arctess.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-148' const='yes' id='type-id-277'/>
-    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-117' const='yes' id='type-id-278'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-127'>
+    <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='384' id='type-id-105'>
       <subrange length='3' type-id='type-id-3' id='type-id-68'/>
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
     <class-decl name='GridVertex' size-in-bits='128' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='39' column='1' id='type-id-219'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gparam' type-id='type-id-161' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
+        <var-decl name='gparam' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/gridvertex.h' line='40' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='GridVertex' filepath='libnurbs/internals/gridvertex.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4639,7 +4639,7 @@
       </member-function>
     </class-decl>
     <class-decl name='GridTrimVertex' size-in-bits='384' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='45' column='1' id='type-id-209'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='dummyt' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/gridtrimvertex.h' line='47' column='1'/>
       </data-member>
@@ -4659,12 +4659,12 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-128'/>
-    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-279'/>
-    <qualified-type-def type-id='type-id-87' id='type-id-125'/>
-    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-87'/>
-    <qualified-type-def type-id='type-id-88' id='type-id-126'/>
-    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-88'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-279'/>
+    <qualified-type-def type-id='type-id-88' id='type-id-103'/>
+    <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-88'/>
+    <qualified-type-def type-id='type-id-89' id='type-id-104'/>
+    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-89'/>
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-188'/>
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-280'/>
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
@@ -4675,12 +4675,12 @@
   <abi-instr address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/ccw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-282'/>
+    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-282'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-211'>
+    <class-decl name='Jarcloc' size-in-bits='192' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='41' column='1' id='type-id-213'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='arc' type-id='type-id-119' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
+        <var-decl name='arc' type-id='type-id-124' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='43' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='p' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='44' column='1'/>
@@ -4689,7 +4689,7 @@
         <var-decl name='plast' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/jarcloc.h' line='45' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-196'>
+    <class-decl name='Trimline' size-in-bits='832' visibility='default' filepath='libnurbs/internals/trimline.h' line='46' column='1' id='type-id-200'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-130' visibility='default' filepath='libnurbs/internals/trimline.h' line='48' column='1'/>
       </data-member>
@@ -4703,7 +4703,7 @@
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/trimline.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
-        <var-decl name='jarcl' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
+        <var-decl name='jarcl' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/trimline.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <var-decl name='t' type-id='type-id-172' visibility='default' filepath='libnurbs/internals/trimline.h' line='53' column='1'/>
@@ -4719,13 +4719,13 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Trimline' filepath='libnurbs/internals/trimline.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Trimline' filepath='libnurbs/internals/trimline.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-194' is-artificial='yes'/>
+          <parameter type-id='type-id-198' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
@@ -4733,31 +4733,31 @@
     </class-decl>
     <class-decl name='TrimRegion' size-in-bits='2560' visibility='default' filepath='libnurbs/internals/trimregion.h' line='46' column='1' id='type-id-173'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='left' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
+        <var-decl name='left' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='49' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='832'>
-        <var-decl name='right' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
+        <var-decl name='right' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='50' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1664'>
-        <var-decl name='top' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
+        <var-decl name='top' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1984'>
-        <var-decl name='bot' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
+        <var-decl name='bot' type-id='type-id-203' visibility='default' filepath='libnurbs/internals/trimregion.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
-        <var-decl name='uarray' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
+        <var-decl name='uarray' type-id='type-id-204' visibility='default' filepath='libnurbs/internals/trimregion.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
         <var-decl name='oneOverDu' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/trimregion.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='TrimRegion' filepath='libnurbs/internals/trimregion.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-201' is-artificial='yes'/>
+          <parameter type-id='type-id-205' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-200'>
+    <class-decl name='Uarray' size-in-bits='192' visibility='default' filepath='libnurbs/internals/uarray.h' line='44' column='1' id='type-id-204'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='size' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/uarray.h' line='46' column='1'/>
       </data-member>
@@ -4769,19 +4769,19 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Uarray' filepath='libnurbs/internals/uarray.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Uarray' filepath='libnurbs/internals/uarray.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-212' is-artificial='yes'/>
+          <parameter type-id='type-id-214' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-199'>
+    <class-decl name='Gridline' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/gridline.h' line='39' column='1' id='type-id-203'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='v' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='40' column='1'/>
       </data-member>
@@ -4798,10 +4798,10 @@
         <var-decl name='uend' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/gridline.h' line='44' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-156'>
+    <class-decl name='CoveAndTiler' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='46' column='1' id='type-id-160'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/coveandtiler.h' line='52' column='1'/>
       </data-member>
       <data-member access='private' static='yes'>
         <var-decl name='MAXSTRIPSIZE' type-id='type-id-174' mangled-name='_ZN12CoveAndTiler12MAXSTRIPSIZEE' visibility='default' filepath='libnurbs/internals/coveandtiler.cc' line='50' column='1'/>
@@ -4810,8 +4810,8 @@
         <function-decl name='CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-175' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -4819,23 +4819,23 @@
         <function-decl name='~CoveAndTiler' filepath='libnurbs/internals/coveandtiler.cc' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-175' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-175'/>
     <qualified-type-def type-id='type-id-175' const='yes' id='type-id-283'/>
     <qualified-type-def type-id='type-id-284' id='type-id-285'/>
     <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-284'/>
     <qualified-type-def type-id='type-id-286' id='type-id-287'/>
     <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-286'/>
     <qualified-type-def type-id='type-id-220' const='yes' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-194'/>
-    <qualified-type-def type-id='type-id-194' const='yes' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-198'/>
+    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-214'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-189' size-in-bits='640' id='type-id-185'>
@@ -4844,7 +4844,7 @@
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='3840' id='type-id-268'>
       <subrange length='120' type-id='type-id-3' id='type-id-275'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-183'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='160' id='type-id-178'>
       <subrange length='5' type-id='type-id-3' id='type-id-190'/>
     </array-type-def>
     <array-type-def dimensions='2' type-id='type-id-1' size-in-bits='800' id='type-id-206'>
@@ -4854,7 +4854,7 @@
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='128' id='type-id-291'>
       <subrange length='4' type-id='type-id-3' id='type-id-65'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-213'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='64' id='type-id-211'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
     <class-decl name='Curve' size-in-bits='8128' visibility='default' filepath='libnurbs/internals/curve.h' line='46' column='1' id='type-id-265'>
@@ -4862,7 +4862,7 @@
         <var-decl name='next' type-id='type-id-247' visibility='default' filepath='libnurbs/internals/curve.h' line='51' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/curve.h' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='stride' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/curve.h' line='54' column='1'/>
@@ -4894,7 +4894,7 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Curve' filepath='libnurbs/internals/curve.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-247' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-1'/>
           <parameter type-id='type-id-247'/>
@@ -4911,9 +4911,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-184'/>
+    <typedef-decl name='Maxmatrix' type-id='type-id-206' filepath='libnurbs/internals/mapdesc.h' line='45' column='1' id='type-id-179'/>
     <class-decl name='Mapdesc' size-in-bits='3392' is-struct='yes' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='49' column='1' id='type-id-136'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pixel_tolerance' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='104' column='1'/>
       </data-member>
@@ -4939,7 +4939,7 @@
         <var-decl name='maxtrate' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='bboxsize' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
+        <var-decl name='bboxsize' type-id='type-id-178' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='112' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='448'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='115' column='1'/>
@@ -4960,13 +4960,13 @@
         <var-decl name='mask' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='672'>
-        <var-decl name='bmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
+        <var-decl name='bmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='121' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1472'>
-        <var-decl name='cmat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
+        <var-decl name='cmat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='122' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2272'>
-        <var-decl name='smat' type-id='type-id-184' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
+        <var-decl name='smat' type-id='type-id-179' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='123' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3072'>
         <var-decl name='s_steps' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='124' column='1'/>
@@ -4984,18 +4984,18 @@
         <var-decl name='bbox_subdividing' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='128' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3264'>
-        <var-decl name='next' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
+        <var-decl name='next' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='129' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='3328'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mapdesc.h' line='130' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Mapdesc' filepath='libnurbs/internals/mapdesc.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-103' is-artificial='yes'/>
+          <parameter type-id='type-id-107' is-artificial='yes'/>
           <parameter type-id='type-id-15'/>
           <parameter type-id='type-id-11'/>
           <parameter type-id='type-id-11'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
@@ -5011,7 +5011,7 @@
         <var-decl name='stride' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/knotvector.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='knotlist' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/knotvector.h' line='51' column='1'/>
+        <var-decl name='knotlist' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/knotvector.h' line='51' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='Knotvector' filepath='libnurbs/internals/knotvector.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5044,13 +5044,13 @@
         <var-decl name='index' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/quilt.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='bdry' type-id='type-id-213' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
+        <var-decl name='bdry' type-id='type-id-211' visibility='default' filepath='libnurbs/internals/quilt.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='step_size' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/quilt.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='breakpoints' type-id='type-id-214' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
+        <var-decl name='breakpoints' type-id='type-id-212' visibility='default' filepath='libnurbs/internals/quilt.h' line='59' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='Knot' type-id='type-id-1' filepath='libnurbs/internals/types.h' line='45' column='1' id='type-id-218'/>
@@ -5058,13 +5058,13 @@
     <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-269'/>
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-247'/>
     <qualified-type-def type-id='type-id-247' const='yes' id='type-id-294'/>
-    <reference-type-def kind='lvalue' type-id='type-id-121' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-126' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-212'/>
     <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-103'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-107'/>
+    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-297'/>
     <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-298'/>
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-299'/>
     <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
   </abi-instr>
@@ -5080,15 +5080,15 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='Dlnode' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/displaylist.h' line='48' column='1' id='type-id-169'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='work' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
+        <var-decl name='work' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='arg' type-id='type-id-25' visibility='default' filepath='libnurbs/internals/displaylist.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='cleanup' type-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='next' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='53' column='1'/>
@@ -5096,15 +5096,15 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='Dlnode' filepath='libnurbs/internals/displaylist.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-152' is-artificial='yes'/>
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-196'/>
           <parameter type-id='type-id-25'/>
-          <parameter type-id='type-id-205'/>
+          <parameter type-id='type-id-196'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-205'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-205' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
+    <typedef-decl name='PFVS' type-id='type-id-217' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-196'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-196' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1' id='type-id-217'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__pfn' type-id='type-id-221' visibility='default' filepath='libnurbs/internals/displaylist.h' line='46' column='1'/>
       </data-member>
@@ -5117,37 +5117,37 @@
         <var-decl name='nodes' type-id='type-id-152' visibility='default' filepath='libnurbs/internals/displaylist.h' line='73' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='dlnodePool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
+        <var-decl name='dlnodePool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/displaylist.h' line='74' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
         <var-decl name='lastNode' type-id='type-id-153' visibility='default' filepath='libnurbs/internals/displaylist.h' line='75' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
-        <var-decl name='nt' type-id='type-id-86' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
+        <var-decl name='nt' type-id='type-id-87' visibility='default' filepath='libnurbs/internals/displaylist.h' line='76' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='DisplayList' filepath='libnurbs/internals/displaylist.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-85' is-artificial='yes'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
+          <parameter type-id='type-id-87'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~DisplayList' filepath='libnurbs/internals/displaylist.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-85' is-artificial='yes'/>
+          <parameter type-id='type-id-86' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-85'/>
-    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-86'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-302'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-152'/>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-87'/>
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-221'/>
     <function-type size-in-bits='64' id='type-id-226'>
-      <parameter type-id='type-id-86' is-artificial='yes'/>
+      <parameter type-id='type-id-87' is-artificial='yes'/>
       <parameter type-id='type-id-25'/>
       <return type-id='type-id-12'/>
     </function-type>
@@ -5160,18 +5160,18 @@
     <qualified-type-def type-id='type-id-177' const='yes' id='type-id-304'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-178'>
+    <class-decl name='Hull' size-in-bits='4800' visibility='default' filepath='libnurbs/internals/hull.h' line='47' column='1' id='type-id-180'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
       <member-type access='private'>
-        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-193'>
+        <class-decl name='Side' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/hull.h' line='55' column='1' id='type-id-197'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='left' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
+            <var-decl name='left' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='56' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='line' type-id='type-id-195' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
+            <var-decl name='line' type-id='type-id-199' visibility='default' filepath='libnurbs/internals/hull.h' line='57' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='right' type-id='type-id-194' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
+            <var-decl name='right' type-id='type-id-198' visibility='default' filepath='libnurbs/internals/hull.h' line='58' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='index' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/hull.h' line='59' column='1'/>
@@ -5179,37 +5179,37 @@
         </class-decl>
       </member-type>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='lower' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
+        <var-decl name='lower' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='62' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='320'>
-        <var-decl name='upper' type-id='type-id-193' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
+        <var-decl name='upper' type-id='type-id-197' visibility='default' filepath='libnurbs/internals/hull.h' line='63' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
-        <var-decl name='fakeleft' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
+        <var-decl name='fakeleft' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='64' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='1408'>
-        <var-decl name='fakeright' type-id='type-id-196' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
+        <var-decl name='fakeright' type-id='type-id-200' visibility='default' filepath='libnurbs/internals/hull.h' line='65' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Hull' filepath='libnurbs/internals/hull.cc' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Hull' filepath='libnurbs/internals/hull.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-197' is-artificial='yes'/>
+          <parameter type-id='type-id-201' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-195'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-197'/>
-    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-199'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-201'/>
+    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-305'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/intersect.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-262' id='type-id-306'/>
@@ -5223,56 +5223,56 @@
   <abi-instr address-size='64' path='libnurbs/internals/mapdescv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-71'>
+    <class-decl name='Maplist' size-in-bits='2688' visibility='default' filepath='libnurbs/internals/maplist.h' line='46' column='1' id='type-id-72'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='mapdescPool' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
+        <var-decl name='mapdescPool' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/maplist.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2496'>
-        <var-decl name='maps' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
+        <var-decl name='maps' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/maplist.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2560'>
-        <var-decl name='lastmap' type-id='type-id-104' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
+        <var-decl name='lastmap' type-id='type-id-108' visibility='default' filepath='libnurbs/internals/maplist.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2624'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/maplist.h' line='61' column='1'/>
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Maplist' filepath='libnurbs/internals/maplist.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-106' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-110' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-106'/>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-110'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-308'/>
     <qualified-type-def type-id='type-id-241' const='yes' id='type-id-309'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-181'>
+    <array-type-def dimensions='1' type-id='type-id-188' size-in-bits='128' id='type-id-183'>
       <subrange length='2' type-id='type-id-3' id='type-id-64'/>
     </array-type-def>
-    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-157'>
+    <class-decl name='Mesher' size-in-bits='7680' visibility='default' filepath='libnurbs/internals/mesher.h' line='47' column='1' id='type-id-161'>
       <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-173'/>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-178'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-180'/>
       <data-member access='private' static='yes'>
-        <var-decl name='ZERO' type-id='type-id-179' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
+        <var-decl name='ZERO' type-id='type-id-181' mangled-name='_ZN6Mesher4ZEROE' visibility='default' filepath='libnurbs/internals/mesher.cc' line='53' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2240'>
-        <var-decl name='backend' type-id='type-id-105' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
+        <var-decl name='backend' type-id='type-id-109' visibility='default' filepath='libnurbs/internals/mesher.h' line='56' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='2304'>
-        <var-decl name='p' type-id='type-id-75' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
+        <var-decl name='p' type-id='type-id-76' visibility='default' filepath='libnurbs/internals/mesher.h' line='58' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4800'>
         <var-decl name='stacksize' type-id='type-id-92' visibility='default' filepath='libnurbs/internals/mesher.h' line='59' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4864'>
-        <var-decl name='vdata' type-id='type-id-180' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
+        <var-decl name='vdata' type-id='type-id-182' visibility='default' filepath='libnurbs/internals/mesher.h' line='60' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='4928'>
-        <var-decl name='last' type-id='type-id-181' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
+        <var-decl name='last' type-id='type-id-183' visibility='default' filepath='libnurbs/internals/mesher.h' line='61' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='5056'>
         <var-decl name='itop' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/mesher.h' line='62' column='1'/>
@@ -5282,26 +5282,26 @@
       </data-member>
       <member-function access='private' constructor='yes'>
         <function-decl name='Mesher' filepath='libnurbs/internals/mesher.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-182' is-artificial='yes'/>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
-          <parameter type-id='type-id-107'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
+          <parameter type-id='type-id-111'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
       <member-function access='private' destructor='yes'>
         <function-decl name='~Mesher' filepath='libnurbs/internals/mesher.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-182' is-artificial='yes'/>
+          <parameter type-id='type-id-184' is-artificial='yes'/>
           <parameter type-id='type-id-11' is-artificial='yes'/>
-          <parameter type-id='type-id-159' is-artificial='yes'/>
+          <parameter type-id='type-id-163' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-182'/>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-310'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-184'/>
+    <qualified-type-def type-id='type-id-184' const='yes' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-181'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-311' size-in-bits='64' id='type-id-312'>
@@ -5428,7 +5428,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='O_pwlcurve' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='83' column='1' id='type-id-139'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pts' type-id='type-id-141' visibility='default' filepath='libnurbs/internals/reader.h' line='85' column='1'/>
       </data-member>
@@ -5445,7 +5445,7 @@
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='90' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_pwlcurve' filepath='libnurbs/internals/reader.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5460,7 +5460,7 @@
       </member-function>
     </class-decl>
     <class-decl name='Property' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='120' column='1' id='type-id-328'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='121' column='1'/>
       </data-member>
@@ -5492,9 +5492,9 @@
       </member-function>
     </class-decl>
     <class-decl name='O_curve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='55' column='1' id='type-id-96'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-165'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='56' column='1' id='type-id-158'>
           <data-member access='private'>
             <var-decl name='o_nurbscurve' type-id='type-id-97' visibility='default' filepath='libnurbs/internals/reader.h' line='57' column='1'/>
           </data-member>
@@ -5504,16 +5504,16 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='curve' type-id='type-id-165' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
+        <var-decl name='curve' type-id='type-id-158' visibility='default' filepath='libnurbs/internals/reader.h' line='59' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='curvetype' type-id='type-id-166' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
+        <var-decl name='curvetype' type-id='type-id-159' visibility='default' filepath='libnurbs/internals/reader.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
+        <var-decl name='next' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='62' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='used' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='63' column='1'/>
@@ -5526,36 +5526,36 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_curve' filepath='libnurbs/internals/reader.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-84' is-artificial='yes'/>
+          <parameter type-id='type-id-85' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='O_trim' size-in-bits='192' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='94' column='1' id='type-id-101'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='o_curve' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
+        <var-decl name='o_curve' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
+        <var-decl name='next' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='96' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='97' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_trim' filepath='libnurbs/internals/reader.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-83' is-artificial='yes'/>
+          <parameter type-id='type-id-84' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='O_surface' size-in-bits='256' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='112' column='1' id='type-id-100'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='o_nurbssurface' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='113' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='o_trim' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
+        <var-decl name='o_trim' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='115' column='1'/>
@@ -5565,27 +5565,27 @@
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_surface' filepath='libnurbs/internals/reader.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-82' is-artificial='yes'/>
+          <parameter type-id='type-id-83' is-artificial='yes'/>
           <return type-id='type-id-12'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-166'>
+    <enum-decl name='Curvetype' filepath='libnurbs/internals/reader.h' line='42' column='1' id='type-id-159'>
       <underlying-type type-id='type-id-9'/>
       <enumerator name='ct_nurbscurve' value='0'/>
       <enumerator name='ct_pwlcurve' value='1'/>
       <enumerator name='ct_none' value='2'/>
     </enum-decl>
     <class-decl name='O_nurbssurface' size-in-bits='320' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='101' column='1' id='type-id-138'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bezier_patches' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
+        <var-decl name='bezier_patches' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='owner' type-id='type-id-82' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
+        <var-decl name='owner' type-id='type-id-83' visibility='default' filepath='libnurbs/internals/reader.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='next' type-id='type-id-98' visibility='default' filepath='libnurbs/internals/reader.h' line='105' column='1'/>
@@ -5605,9 +5605,9 @@
       </member-function>
     </class-decl>
     <class-decl name='O_nurbscurve' size-in-bits='384' is-struct='yes' visibility='default' filepath='libnurbs/internals/reader.h' line='70' column='1' id='type-id-137'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-157'/>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='bezier_curves' type-id='type-id-120' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
+        <var-decl name='bezier_curves' type-id='type-id-125' visibility='default' filepath='libnurbs/internals/reader.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-15' visibility='default' filepath='libnurbs/internals/reader.h' line='72' column='1'/>
@@ -5628,7 +5628,7 @@
         <var-decl name='save' type-id='type-id-11' visibility='default' filepath='libnurbs/internals/reader.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='owner' type-id='type-id-84' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
+        <var-decl name='owner' type-id='type-id-85' visibility='default' filepath='libnurbs/internals/reader.h' line='78' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='O_nurbscurve' filepath='libnurbs/internals/reader.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5638,20 +5638,20 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-85'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-79'/>
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-97'/>
-    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-80'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-82'/>
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-99'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
-    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-82'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-77'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-83'/>
+    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-78'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-118'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-274' size-in-bits='640' id='type-id-271'>
@@ -5669,7 +5669,7 @@
         <var-decl name='range' type-id='type-id-230' visibility='default' filepath='libnurbs/internals/patch.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='sidestep' type-id='type-id-160' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
+        <var-decl name='sidestep' type-id='type-id-164' visibility='default' filepath='libnurbs/internals/patch.h' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
         <var-decl name='stepsize' type-id='type-id-1' visibility='default' filepath='libnurbs/internals/patch.h' line='49' column='1'/>
@@ -5683,7 +5683,7 @@
     </class-decl>
     <class-decl name='Patch' size-in-bits='277696' visibility='default' filepath='libnurbs/internals/patch.h' line='62' column='1' id='type-id-266'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='mapdesc' type-id='type-id-103' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
+        <var-decl name='mapdesc' type-id='type-id-107' visibility='default' filepath='libnurbs/internals/patch.h' line='82' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='next' type-id='type-id-256' visibility='default' filepath='libnurbs/internals/patch.h' line='83' column='1'/>
@@ -5715,7 +5715,7 @@
       <member-function access='private' constructor='yes'>
         <function-decl name='Patch' filepath='libnurbs/internals/patch.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-256' is-artificial='yes'/>
-          <parameter type-id='type-id-120'/>
+          <parameter type-id='type-id-125'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-16'/>
           <parameter type-id='type-id-256'/>
@@ -5757,10 +5757,10 @@
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/quilt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-295' id='type-id-335'/>
-    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-336'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/renderhints.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-337'/>
+    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-337'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='rectBlock' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/rectBlock.h' line='39' column='1' id='type-id-338'>
@@ -5915,9 +5915,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-158'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-347'/>
-    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-162'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-347'/>
+    <qualified-type-def type-id='type-id-205' const='yes' id='type-id-348'/>
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-340'/>
     <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
     <qualified-type-def type-id='type-id-342' const='yes' id='type-id-349'/>
@@ -5929,7 +5929,7 @@
     <qualified-type-def type-id='type-id-345' const='yes' id='type-id-352'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/sorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-202' const='yes' id='type-id-353'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/subdivider.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-259' id='type-id-354'/>
@@ -6053,7 +6053,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='Quilt_ptr' type-id='type-id-120' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-362'/>
+    <typedef-decl name='Quilt_ptr' type-id='type-id-125' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-362'/>
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-357'/>
     <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-358'/>
     <qualified-type-def type-id='type-id-358' const='yes' id='type-id-363'/>
@@ -6068,7 +6068,7 @@
     <qualified-type-def type-id='type-id-131' const='yes' id='type-id-367'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/uarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-368'/>
+    <qualified-type-def type-id='type-id-214' const='yes' id='type-id-368'/>
   </abi-instr>
   <abi-instr address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='32000' id='type-id-369'>
@@ -6308,11 +6308,11 @@
     <type-decl name='float' size-in-bits='32' id='type-id-28'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-15'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='512' id='type-id-222'>
-      <subrange length='8' type-id='type-id-3' id='type-id-224'/>
+      <subrange length='8' type-id='type-id-3' id='type-id-225'/>
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-9'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-3'/>
-    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-225'>
+    <array-type-def dimensions='1' type-id='type-id-3' size-in-bits='1024' id='type-id-224'>
       <subrange length='16' type-id='type-id-3' id='type-id-227'/>
     </array-type-def>
     <typedef-decl name='GLUtesselator' type-id='type-id-399' filepath='../../../include/GL/glu.h' line='276' column='1' id='type-id-400'/>
@@ -6411,7 +6411,7 @@
         <var-decl name='callCombineData' type-id='type-id-413' visibility='default' filepath='libtess/tess.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27712'>
-        <var-decl name='env' type-id='type-id-163' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
+        <var-decl name='env' type-id='type-id-156' visibility='default' filepath='libtess/tess.h' line='121' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29312'>
         <var-decl name='polygonData' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='123' column='1'/>
@@ -6653,12 +6653,12 @@
         <var-decl name='data' type-id='type-id-25' visibility='default' filepath='libtess/tess.h' line='56' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-163'/>
+    <typedef-decl name='jmp_buf' type-id='type-id-187' filepath='/usr/include/setjmp.h' line='49' column='1' id='type-id-156'/>
     <typedef-decl name='__jmp_buf' type-id='type-id-222' filepath='/usr/include/bits/setjmp.h' line='32' column='1' id='type-id-215'/>
     <typedef-decl name='__sigset_t' type-id='type-id-223' filepath='/usr/include/bits/sigset.h' line='32' column='1' id='type-id-216'/>
     <class-decl name='__anonymous_struct__2' size-in-bits='1024' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-216' visibility='default' filepath='/usr/include/bits/sigset.h' line='30' column='1' id='type-id-223'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__val' type-id='type-id-225' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
+        <var-decl name='__val' type-id='type-id-224' visibility='default' filepath='/usr/include/bits/sigset.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-415'/>
@@ -6688,7 +6688,7 @@
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-22'/>
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-23'/>
     <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-163'/>
     <function-decl name='gluTessProperty' mangled-name='gluTessProperty' filepath='libtess/tess.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluTessProperty'>
       <parameter type-id='type-id-452' name='tess' filepath='libtess/tess.c' line='201' column='1'/>
       <parameter type-id='type-id-59' name='which' filepath='libtess/tess.c' line='201' column='1'/>
@@ -6780,16 +6780,16 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-457'>
       <parameter type-id='type-id-462'/>
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <return type-id='type-id-12'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-458'>
       <parameter type-id='type-id-462'/>
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-159'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-25'/>
       <return type-id='type-id-12'/>
     </function-type>
@@ -6931,8 +6931,8 @@
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-469'/>
     <qualified-type-def type-id='type-id-397' const='yes' id='type-id-470'/>
     <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-471'/>
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-89'/>
-    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-62'/>
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-62'/>
     <function-decl name='gluProject' mangled-name='gluProject' filepath='libutil/project.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluProject'>
       <parameter type-id='type-id-397' name='objx' filepath='libutil/project.c' line='234' column='1'/>
       <parameter type-id='type-id-397' name='objy' filepath='libutil/project.c' line='234' column='1'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 42dd9331..5558ce1d 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -2608,38 +2608,26 @@
         </data-member>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='map1_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='131072'>
-          <var-decl name='mu_' type-id='type-id-119' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='649' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-135'/>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-131'/>
     <namespace-decl name='__sanitizer'>
       <class-decl name='IntrusiveList&lt;__sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;::TransferBatch&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-129'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='first_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+          <var-decl name='first_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='last_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+          <var-decl name='last_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-127'>
         <member-type access='public'>
-          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-142'/>
+          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-141'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-143'>
+          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
             </data-member>
@@ -2647,7 +2635,7 @@
               <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -2655,7 +2643,7 @@
           <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='per_class_' type-id='type-id-145' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='440960'>
           <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
@@ -2663,22 +2651,32 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-146'>
+      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-145'>
         <member-type access='public'>
           <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-125'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='next' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-146' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='map1_' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='131072'>
+          <var-decl name='mu_' type-id='type-id-119' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='649' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <class-decl name='atomic_uint8_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='28' column='1' id='type-id-134'>
         <member-type access='public'>
@@ -2689,24 +2687,26 @@
         </data-member>
       </class-decl>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='440960' id='type-id-145'>
+    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-135'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-138'/>
+    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='440960' id='type-id-144'>
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-138'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-141'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-140'/>
     <array-type-def dimensions='1' type-id='type-id-151' size-in-bits='256' id='type-id-139'>
       <subrange length='4' type-id='type-id-50' id='type-id-152'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-140'>
+    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-147'>
       <subrange length='2048' type-id='type-id-50' id='type-id-154'/>
     </array-type-def>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='u8' type-id='type-id-17' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='66' column='1' id='type-id-149'/>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-144'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-143'>
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-147'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-146'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
     <qualified-type-def type-id='type-id-148' volatile='yes' id='type-id-150'/>
@@ -3256,7 +3256,6 @@
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-240'/>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-239'/>
     <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-241'/>
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
     <namespace-decl name='__sanitizer'>
       <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-243'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -3273,6 +3272,7 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-244'/>
     <namespace-decl name='__sanitizer'>
       <enum-decl name='SuppressionType' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='19' column='1' id='type-id-245'>
         <underlying-type type-id='type-id-62'/>
@@ -3573,6 +3573,13 @@
         <return type-id='type-id-287'/>
       </function-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='__sanitizer_kernel_sigset_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='419' column='1' id='type-id-282'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='sig' type-id='type-id-289' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='420' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <enum-decl name='memory_order' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='19' column='1' id='type-id-288'>
         <underlying-type type-id='type-id-62'/>
@@ -3595,13 +3602,6 @@
       <parameter type-id='type-id-106'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='__sanitizer_kernel_sigset_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='419' column='1' id='type-id-282'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='sig' type-id='type-id-289' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='420' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <typedef-decl name='Elf64_Addr' type-id='type-id-290' filepath='/usr/include/elf.h' line='50' column='1' id='type-id-249'/>
     <typedef-decl name='Elf64_Xword' type-id='type-id-290' filepath='/usr/include/elf.h' line='45' column='1' id='type-id-255'/>
     <namespace-decl name='__sanitizer'>
@@ -3715,11 +3715,11 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-25'/>
     </function-decl>
+    <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
     <function-type size-in-bits='64' id='type-id-306'>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-112'/>
     </function-type>
-    <class-decl name='_Unwind_Context' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-312'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
@@ -4820,7 +4820,6 @@
     <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-408'/>
     <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-404'/>
     <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-403'/>
-    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-411'/>
     <namespace-decl name='__sanitizer'>
       <class-decl name='AddressInfo' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.h' line='26' column='1' id='type-id-409'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -4874,6 +4873,7 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-411'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <typedef-decl name='demangle_callbackref' type-id='type-id-89' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-87'/>
@@ -5131,6 +5131,19 @@
     <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-430'/>
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-432'/>
     <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-434'/>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='IntrusiveList&lt;__sanitizer::ThreadContextBase&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-436'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='first_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='last_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__sanitizer'>
       <class-decl name='ThreadContextBase' size-in-bits='1024' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='32' column='1' id='type-id-437'>
         <data-member access='public' layout-offset-in-bits='64'>
@@ -5233,19 +5246,6 @@
       </class-decl>
     </namespace-decl>
     <qualified-type-def type-id='type-id-436' const='yes' id='type-id-438'/>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='IntrusiveList&lt;__sanitizer::ThreadContextBase&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='26' column='1' id='type-id-436'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='first_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='last_' type-id='type-id-432' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='512' id='type-id-440'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
@@ -5739,15 +5739,118 @@
     <namespace-decl name='__tsan'>
       <typedef-decl name='AllocatorCache' type-id='type-id-501' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='133' column='1' id='type-id-476'/>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
-    </array-type-def>
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-488'/>
     <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-490'/>
     <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-492'/>
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-496'/>
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-495'/>
+    <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
+    </array-type-def>
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-497'/>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
+        <member-type access='public'>
+          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-504'>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='64'>
+              <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='128'>
+              <var-decl name='batch' type-id='type-id-505' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+            </data-member>
+          </class-decl>
+        </member-type>
+        <member-type access='public'>
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-506'/>
+        </member-type>
+        <data-member access='public' static='yes'>
+          <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='per_class_' type-id='type-id-508' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='875136'>
+          <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <class-decl name='Context' size-in-bits='549632' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='526' column='1' id='type-id-484'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='initialized' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='529' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='synctab' type-id='type-id-509' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516736'>
+          <var-decl name='report_mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516800'>
+          <var-decl name='nreported' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516832'>
+          <var-decl name='nmissed_expected' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516864'>
+          <var-decl name='last_symbolize_time_ns' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516928'>
+          <var-decl name='thread_registry' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='516992'>
+          <var-decl name='racy_stacks' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517248'>
+          <var-decl name='racy_addresses' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517504'>
+          <var-decl name='fired_suppressions' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='517696'>
+          <var-decl name='flags' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='518656'>
+          <var-decl name='stat' type-id='type-id-479' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='547' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='546688'>
+          <var-decl name='int_alloc_cnt' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='548160'>
+          <var-decl name='int_alloc_siz' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
+        </data-member>
+        <member-function access='public' constructor='yes'>
+          <function-decl name='Context' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public' constructor='yes'>
+          <function-decl name='Context' mangled-name='_ZN6__tsan7ContextC2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-483' is-artificial='yes'/>
+            <return type-id='type-id-4'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-485'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='in_blocking_func' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='32'>
+          <var-decl name='int_signal_send' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='pending_signal_count' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='pending_signals' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__tsan'>
       <class-decl name='ThreadContext' size-in-bits='1536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='478' column='1' id='type-id-486'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-437'/>
@@ -5836,125 +5939,22 @@
       </class-decl>
     </namespace-decl>
     <qualified-type-def type-id='type-id-157' const='yes' id='type-id-489'/>
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-498'/>
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='704' id='type-id-487'>
-      <subrange length='11' type-id='type-id-50' id='type-id-505'/>
+      <subrange length='11' type-id='type-id-50' id='type-id-519'/>
     </array-type-def>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
-        <member-type access='public'>
-          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-506'>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-507' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
-            </data-member>
-          </class-decl>
-        </member-type>
-        <member-type access='public'>
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-508'/>
-        </member-type>
-        <data-member access='public' static='yes'>
-          <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='per_class_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='875136'>
-          <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <class-decl name='Context' size-in-bits='549632' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='526' column='1' id='type-id-484'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='initialized' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='529' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='synctab' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516736'>
-          <var-decl name='report_mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516800'>
-          <var-decl name='nreported' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516832'>
-          <var-decl name='nmissed_expected' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='535' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516864'>
-          <var-decl name='last_symbolize_time_ns' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516928'>
-          <var-decl name='thread_registry' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='516992'>
-          <var-decl name='racy_stacks' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517248'>
-          <var-decl name='racy_addresses' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517504'>
-          <var-decl name='fired_suppressions' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='517696'>
-          <var-decl name='flags' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='518656'>
-          <var-decl name='stat' type-id='type-id-479' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='547' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='546688'>
-          <var-decl name='int_alloc_cnt' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='548160'>
-          <var-decl name='int_alloc_siz' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
-        </data-member>
-        <member-function access='public' constructor='yes'>
-          <function-decl name='Context' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-483' is-artificial='yes'/>
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public' constructor='yes'>
-          <function-decl name='Context' mangled-name='_ZN6__tsan7ContextC2Ev' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-483' is-artificial='yes'/>
-            <return type-id='type-id-4'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <class-decl name='SignalContext' size-in-bits='553088' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='121' column='1' id='type-id-485'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='in_blocking_func' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='122' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='int_signal_send' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='123' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='pending_signal_count' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='pending_signals' type-id='type-id-519' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='512' id='type-id-491'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-506' size-in-bits='875136' id='type-id-510'>
+    <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='875136' id='type-id-508'>
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-520' size-in-bits='552960' id='type-id-519'>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-511'/>
+    <array-type-def dimensions='1' type-id='type-id-521' size-in-bits='552960' id='type-id-517'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-513'/>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-516'>
+      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-514'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='data_' type-id='type-id-522' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
         </data-member>
@@ -5987,44 +5987,151 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='__sanitizer'>
+      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-525'>
+        <member-type access='public'>
+          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-507'>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <var-decl name='next' type-id='type-id-526' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='64'>
+              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
+            </data-member>
+            <data-member access='public' layout-offset-in-bits='128'>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+            </data-member>
+          </class-decl>
+        </member-type>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-515'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-527'/>
+        <data-member access='public' layout-offset-in-bits='384'>
+          <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='392'>
+          <var-decl name='suppress_equal_stacks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='30' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='400'>
+          <var-decl name='suppress_equal_addresses' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='33' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='408'>
+          <var-decl name='suppress_java' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='36' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='416'>
+          <var-decl name='report_bugs' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='38' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='424'>
+          <var-decl name='report_thread_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='40' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='432'>
+          <var-decl name='report_destroy_locked' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='42' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='440'>
+          <var-decl name='report_signal_unsafe' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='45' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='448'>
+          <var-decl name='report_atomic_races' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='47' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='456'>
+          <var-decl name='force_seq_cst_atomics' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='50' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='512'>
+          <var-decl name='suppressions' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='52' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='576'>
+          <var-decl name='print_suppressions' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='54' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='584'>
+          <var-decl name='print_benign' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='608'>
+          <var-decl name='exitcode' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='58' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='640'>
+          <var-decl name='halt_on_error' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='672'>
+          <var-decl name='atexit_sleep_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='63' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='704'>
+          <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='768'>
+          <var-decl name='flush_memory_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='67' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='800'>
+          <var-decl name='flush_symbolizer_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='69' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='832'>
+          <var-decl name='memory_limit_mb' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='72' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='864'>
+          <var-decl name='stop_on_start' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='872'>
+          <var-decl name='running_on_valgrind' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='896'>
+          <var-decl name='history_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='82' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='928'>
+          <var-decl name='io_sync' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='87' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='__tsan'>
+      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-502'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='mangled_sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='392' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='shadow_stack_pos' type-id='type-id-472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='393' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-512'>
+      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-510'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='state_' type-id='type-id-153' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='51' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-526'/>
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-530'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-531'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Mutex' mangled-name='_ZN6__tsan5MutexC2ENS_9MutexTypeENS_8StatTypeE' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-526'/>
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-530'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -6032,27 +6139,27 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-511'>
+      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-509'>
         <member-type access='private'>
-          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-529'>
+          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-532'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
+              <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='val' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
+              <var-decl name='val' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='pad' type-id='type-id-531' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
+              <var-decl name='pad' type-id='type-id-534' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Part' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Part' mangled-name='_ZN6__tsan7SyncTab4PartC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -6062,40 +6169,40 @@
           <var-decl name='kPartCount' type-id='type-id-110' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='110' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='tab_' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
+          <var-decl name='tab_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='516608'>
           <var-decl name='uid_gen_' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='112' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-538'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncTab' mangled-name='_ZN6__tsan7SyncTabC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -6103,212 +6210,148 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-515'>
+      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-513'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='begin_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='end_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='last_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <parameter type-id='type-id-451'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
-            <parameter type-id='type-id-538'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-541'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-514'>
+      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-512'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <parameter type-id='type-id-451'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <parameter type-id='type-id-541'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-544'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-504'/>
-    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-518'>
-      <subrange length='23' type-id='type-id-50' id='type-id-542'/>
+    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-518'/>
+    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-516'>
+      <subrange length='23' type-id='type-id-50' id='type-id-545'/>
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-505'>
+      <subrange length='256' type-id='type-id-50' id='type-id-194'/>
+    </array-type-def>
+    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-539'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-535'/>
+    <array-type-def dimensions='1' type-id='type-id-532' size-in-bits='516608' id='type-id-536'>
+      <subrange length='1009' type-id='type-id-50' id='type-id-549'/>
+    </array-type-def>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-543'/>
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-534'>
+      <subrange length='48' type-id='type-id-50' id='type-id-551'/>
     </array-type-def>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-543'>
-        <member-type access='public'>
-          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-509'>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='next' type-id='type-id-544' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
-            </data-member>
-            <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
-            </data-member>
-          </class-decl>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-517'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-545'/>
-        <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='392'>
-          <var-decl name='suppress_equal_stacks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='30' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='400'>
-          <var-decl name='suppress_equal_addresses' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='33' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='408'>
-          <var-decl name='suppress_java' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='36' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='416'>
-          <var-decl name='report_bugs' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='38' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='424'>
-          <var-decl name='report_thread_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='40' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='432'>
-          <var-decl name='report_destroy_locked' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='42' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='440'>
-          <var-decl name='report_signal_unsafe' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='45' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='report_atomic_races' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='47' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='456'>
-          <var-decl name='force_seq_cst_atomics' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='50' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='suppressions' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='52' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='print_suppressions' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='54' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='584'>
-          <var-decl name='print_benign' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='56' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='608'>
-          <var-decl name='exitcode' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='58' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='halt_on_error' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='60' column='1'/>
+      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-527'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='672'>
-          <var-decl name='atexit_sleep_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='63' column='1'/>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='external_symbolizer_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='28' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='704'>
-          <var-decl name='profile_memory' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='65' column='1'/>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='strip_path_prefix' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='30' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='768'>
-          <var-decl name='flush_memory_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='67' column='1'/>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='fast_unwind_on_fatal' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='32' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='800'>
-          <var-decl name='flush_symbolizer_ms' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='69' column='1'/>
+        <data-member access='public' layout-offset-in-bits='200'>
+          <var-decl name='fast_unwind_on_malloc' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='34' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='832'>
-          <var-decl name='memory_limit_mb' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='72' column='1'/>
+        <data-member access='public' layout-offset-in-bits='208'>
+          <var-decl name='handle_ioctl' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='864'>
-          <var-decl name='stop_on_start' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='74' column='1'/>
+        <data-member access='public' layout-offset-in-bits='224'>
+          <var-decl name='malloc_context_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='38' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='872'>
-          <var-decl name='running_on_valgrind' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='76' column='1'/>
+        <data-member access='public' layout-offset-in-bits='256'>
+          <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='history_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='82' column='1'/>
+        <data-member access='public' layout-offset-in-bits='320'>
+          <var-decl name='verbosity' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='44' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='928'>
-          <var-decl name='io_sync' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='87' column='1'/>
+        <data-member access='public' layout-offset-in-bits='352'>
+          <var-decl name='detect_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
         </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-503'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
+        <data-member access='public' layout-offset-in-bits='360'>
+          <var-decl name='leak_check_at_exit' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='50' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='mangled_sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='392' column='1'/>
+        <data-member access='public' layout-offset-in-bits='368'>
+          <var-decl name='allocator_may_return_null' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='52' column='1'/>
         </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='shadow_stack_pos' type-id='type-id-472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='393' column='1'/>
+        <data-member access='public' layout-offset-in-bits='376'>
+          <var-decl name='print_summary' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='54' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-507'>
-      <subrange length='256' type-id='type-id-50' id='type-id-194'/>
-    </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-529' size-in-bits='516608' id='type-id-533'>
-      <subrange length='1009' type-id='type-id-50' id='type-id-546'/>
-    </array-type-def>
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-523'/>
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-544'/>
-    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-525'/>
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-536'/>
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-539'/>
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-534'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-532'/>
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-530'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-537'/>
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-540'/>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-531'>
-      <subrange length='48' type-id='type-id-50' id='type-id-551'/>
-    </array-type-def>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-521'>
+      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-520'>
         <member-type access='public'>
           <typedef-decl name='ThreadCallback' type-id='type-id-553' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-552'/>
         </member-type>
@@ -6356,7 +6399,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadRegistry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-558'/>
             <parameter type-id='type-id-284'/>
             <parameter type-id='type-id-284'/>
@@ -6365,7 +6408,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadRegistry' mangled-name='_ZN11__sanitizer14ThreadRegistryC2EPFPNS_17ThreadContextBaseEjEjj' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-558'/>
             <parameter type-id='type-id-284'/>
             <parameter type-id='type-id-284'/>
@@ -6374,13 +6417,29 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-524'/>
-    <reference-type-def kind='lvalue' type-id='type-id-560' size-in-bits='64' id='type-id-528'/>
-    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-535'/>
-    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-538'/>
-    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-541'/>
     <namespace-decl name='__tsan'>
-      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-526'>
+      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-521'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='8'>
+          <var-decl name='sigaction' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='116' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='siginfo' type-id='type-id-559' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='1088'>
+          <var-decl name='ctx' type-id='type-id-560' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-524'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-531'/>
+    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-544'/>
+    <namespace-decl name='__tsan'>
+      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-529'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='MutexTypeInvalid' value='0'/>
         <enumerator name='MutexTypeTrace' value='1'/>
@@ -6397,7 +6456,7 @@
       </enum-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-527'>
+      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-530'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='StatMop' value='0'/>
         <enumerator name='StatMopRead' value='1'/>
@@ -6840,75 +6899,10 @@
         <enumerator name='StatCnt' value='438'/>
       </enum-decl>
     </namespace-decl>
-    <namespace-decl name='__sanitizer'>
-      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-545'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='external_symbolizer_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='28' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='strip_path_prefix' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='30' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='fast_unwind_on_fatal' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='32' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='200'>
-          <var-decl name='fast_unwind_on_malloc' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='34' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='208'>
-          <var-decl name='handle_ioctl' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='36' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='224'>
-          <var-decl name='malloc_context_size' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='38' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='log_path' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='42' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='verbosity' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='44' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='352'>
-          <var-decl name='detect_leaks' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='46' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='360'>
-          <var-decl name='leak_check_at_exit' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='50' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='368'>
-          <var-decl name='allocator_may_return_null' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='52' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='376'>
-          <var-decl name='print_summary' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='54' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='__tsan'>
-      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-520'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='8'>
-          <var-decl name='sigaction' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='116' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='siginfo' type-id='type-id-564' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='1088'>
-          <var-decl name='ctx' type-id='type-id-565' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
     <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-557'/>
     <pointer-type-def type-id='type-id-566' size-in-bits='64' id='type-id-555'/>
-    <qualified-type-def type-id='type-id-516' const='yes' id='type-id-559'/>
-    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-556'/>
-    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-560'/>
-    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-561'/>
-    <qualified-type-def type-id='type-id-515' const='yes' id='type-id-562'/>
-    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-563'/>
     <namespace-decl name='__tsan'>
-      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-547'>
+      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-546'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='type' type-id='type-id-567' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='521' column='1'/>
         </data-member>
@@ -6921,7 +6915,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-548'>
+      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-547'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='addr_min' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='516' column='1'/>
         </data-member>
@@ -6931,7 +6925,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-549'>
+      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-548'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='type-id-568' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='505' column='1'/>
         </data-member>
@@ -6943,7 +6937,7 @@
           <var-decl name='kInvalidTid' type-id='type-id-110' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='53' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='addr' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='56' column='1'/>
@@ -6982,11 +6976,11 @@
           <var-decl name='is_linker_init' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='67' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='next' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
+          <var-decl name='next' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncVar' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <parameter type-id='type-id-106'/>
             <parameter type-id='type-id-157'/>
             <return type-id='type-id-4'/>
@@ -6994,7 +6988,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncVar' mangled-name='_ZN6__tsan7SyncVarC2Emy' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <parameter type-id='type-id-106'/>
             <parameter type-id='type-id-157'/>
             <return type-id='type-id-4'/>
@@ -7002,24 +6996,30 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-564'>
+    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-559'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='opaque' type-id='type-id-569' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='34' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-565'>
+    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-560'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='opaque' type-id='type-id-570' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='39' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-561'/>
+    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-556'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-562'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-563'/>
+    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-564'/>
+    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-565'/>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='ThreadContextFactory' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-558'/>
     </namespace-decl>
     <pointer-type-def type-id='type-id-572' size-in-bits='64' id='type-id-553'/>
-    <array-type-def dimensions='1' type-id='type-id-573' size-in-bits='256' id='type-id-568'>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-571'/>
+    <array-type-def dimensions='1' type-id='type-id-574' size-in-bits='256' id='type-id-568'>
       <subrange length='2' type-id='type-id-50' id='type-id-499'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-571'/>
     <namespace-decl name='__tsan'>
       <enum-decl name='ReportType' filepath='../../.././libsanitizer/tsan/tsan_report.h' line='19' column='1' id='type-id-567'>
         <underlying-type type-id='type-id-62'/>
@@ -7036,10 +7036,10 @@
       <subrange length='118' type-id='type-id-50' id='type-id-575'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1024' id='type-id-569'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <namespace-decl name='__tsan'>
-      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-573'>
+      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-574'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='type-id-474' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='148' column='1'/>
         </data-member>
@@ -7047,7 +7047,7 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-576'/>
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-577'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-578'/>
     <namespace-decl name='__sanitizer'>
@@ -7074,7 +7074,7 @@
     <array-type-def dimensions='1' type-id='type-id-226' size-in-bits='32768' id='type-id-230'>
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-520' size-in-bits='552960' id='type-id-519'>
+    <array-type-def dimensions='1' type-id='type-id-521' size-in-bits='552960' id='type-id-517'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-112' size-in-bits='1024' id='type-id-583'>
@@ -7108,7 +7108,7 @@
       <subrange length='118' type-id='type-id-50' id='type-id-575'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1024' id='type-id-569'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='48' id='type-id-594'>
       <subrange length='6' type-id='type-id-50' id='type-id-164'/>
@@ -7117,7 +7117,7 @@
       <subrange length='8' type-id='type-id-50' id='type-id-294'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='1024' id='type-id-595'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='256' id='type-id-596'>
       <subrange length='4' type-id='type-id-50' id='type-id-152'/>
@@ -7169,12 +7169,12 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-564'>
+    <class-decl name='my_siginfo_t' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='32' column='1' id='type-id-559'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='opaque' type-id='type-id-569' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='34' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-565'>
+    <class-decl name='ucontext_t' size-in-bits='7552' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='37' column='1' id='type-id-560'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='opaque' type-id='type-id-570' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='39' column='1'/>
       </data-member>
@@ -7206,13 +7206,13 @@
         <var-decl name='kMaxAtExit' type-id='type-id-110' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='332' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='mtx_' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
+        <var-decl name='mtx_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='333' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
         <var-decl name='stack_' type-id='type-id-597' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='334' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='8256'>
-        <var-decl name='args_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='335' column='1'/>
+        <var-decl name='args_' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='335' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='16448'>
         <var-decl name='is_on_exits_' type-id='type-id-583' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='336' column='1'/>
@@ -7905,7 +7905,7 @@
     <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-1113'/>
     <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-1375'/>
     <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-1376'/>
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1377'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1377'/>
     <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-612'/>
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-1378'/>
     <pointer-type-def type-id='type-id-611' size-in-bits='64' id='type-id-1379'/>
@@ -8424,7 +8424,7 @@
       </function-decl>
     </namespace-decl>
     <namespace-decl name='__tsan'>
-      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-520'>
+      <class-decl name='SignalDesc' size-in-bits='8640' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='114' column='1' id='type-id-521'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='armed' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='115' column='1'/>
         </data-member>
@@ -8432,10 +8432,10 @@
           <var-decl name='sigaction' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='siginfo' type-id='type-id-564' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
+          <var-decl name='siginfo' type-id='type-id-559' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='117' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
-          <var-decl name='ctx' type-id='type-id-565' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
+          <var-decl name='ctx' type-id='type-id-560' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='118' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='RoundUp&lt;long unsigned int&gt;' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14633,7 +14633,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <reference-type-def kind='lvalue' type-id='type-id-1442' size-in-bits='64' id='type-id-1435'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1242'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-1441'/>
     <function-type size-in-bits='64' id='type-id-1160'>
       <parameter type-id='type-id-1' name='dirp'/>
@@ -15812,7 +15812,7 @@
     <namespace-decl name='__tsan'>
       <class-decl name='DynamicAnnContext' size-in-bits='3008' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='78' column='1' id='type-id-1457'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='79' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='79' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='expect' type-id='type-id-1459' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_ann.cc' line='80' column='1'/>
@@ -16167,41 +16167,41 @@
     <array-type-def dimensions='1' type-id='type-id-128' size-in-bits='27136' id='type-id-133'>
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='440960' id='type-id-145'>
+    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='440960' id='type-id-144'>
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-506' size-in-bits='875136' id='type-id-510'>
+    <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='875136' id='type-id-508'>
       <subrange length='53' type-id='type-id-50' id='type-id-136'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-151' size-in-bits='256' id='type-id-139'>
       <subrange length='4' type-id='type-id-50' id='type-id-152'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-140'>
+    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='131072' id='type-id-147'>
       <subrange length='2048' type-id='type-id-50' id='type-id-154'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-573' size-in-bits='256' id='type-id-568'>
+    <array-type-def dimensions='1' type-id='type-id-574' size-in-bits='256' id='type-id-568'>
       <subrange length='2' type-id='type-id-50' id='type-id-499'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-493' size-in-bits='3072' id='type-id-494'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-529' size-in-bits='516608' id='type-id-533'>
-      <subrange length='1009' type-id='type-id-50' id='type-id-546'/>
+    <array-type-def dimensions='1' type-id='type-id-532' size-in-bits='516608' id='type-id-536'>
+      <subrange length='1009' type-id='type-id-50' id='type-id-549'/>
     </array-type-def>
     <type-decl name='bool' size-in-bits='8' id='type-id-112'/>
     <type-decl name='char' size-in-bits='8' id='type-id-5'/>
     <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='256' id='type-id-130'>
       <subrange length='32' type-id='type-id-50' id='type-id-137'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-531'>
+    <array-type-def dimensions='1' type-id='type-id-5' size-in-bits='384' id='type-id-534'>
       <subrange length='48' type-id='type-id-50' id='type-id-551'/>
     </array-type-def>
     <type-decl name='long int' size-in-bits='64' id='type-id-45'/>
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='704' id='type-id-487'>
-      <subrange length='11' type-id='type-id-50' id='type-id-505'/>
+      <subrange length='11' type-id='type-id-50' id='type-id-519'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-518'>
-      <subrange length='23' type-id='type-id-50' id='type-id-542'/>
+    <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='1472' id='type-id-516'>
+      <subrange length='23' type-id='type-id-50' id='type-id-545'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-161' size-in-bits='128' id='type-id-474'>
       <subrange length='2' type-id='type-id-50' id='type-id-499'/>
@@ -16212,15 +16212,15 @@
     <type-decl name='short int' size-in-bits='16' id='type-id-77'/>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-17'/>
     <array-type-def dimensions='1' type-id='type-id-211' size-in-bits='512' id='type-id-491'>
-      <subrange length='16' type-id='type-id-50' id='type-id-502'/>
+      <subrange length='16' type-id='type-id-50' id='type-id-503'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='640' id='type-id-234'>
       <subrange length='10' type-id='type-id-50' id='type-id-242'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-144'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='8192' id='type-id-143'>
       <subrange length='128' type-id='type-id-50' id='type-id-155'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-507'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='16384' id='type-id-505'>
       <subrange length='256' type-id='type-id-50' id='type-id-194'/>
     </array-type-def>
     <enum-decl name='LinkerInitialized' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='283' column='1' id='type-id-231'>
@@ -16275,7 +16275,7 @@
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-1490'/>
     <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-138'/>
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-523'/>
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-1491'/>
     <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-430'/>
     <pointer-type-def type-id='type-id-1492' size-in-bits='64' id='type-id-1493'/>
@@ -16289,15 +16289,15 @@
     <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
     <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-1506'/>
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-544'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-141'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-140'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-120'/>
     <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-1508'/>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-239'/>
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-432'/>
-    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-571'/>
     <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-511'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-1509'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-473'/>
     <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-1510'/>
@@ -16306,27 +16306,27 @@
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-488'/>
     <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-490'/>
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-1511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-1513'/>
+    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-1512'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-1513'/>
     <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-492'/>
-    <reference-type-def kind='lvalue' type-id='type-id-503' size-in-bits='64' id='type-id-1514'/>
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-496'/>
-    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-525'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-1514'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-528'/>
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-495'/>
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-1515'/>
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-549' size-in-bits='64' id='type-id-1516'/>
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-539'/>
+    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1515'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-539'/>
+    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-1516'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-542'/>
     <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-534'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-532'/>
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-509' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-535'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-533'/>
     <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-480'/>
     <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-467'/>
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-497'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-537'/>
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-543'/>
     <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1517'/>
     <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1518'/>
     <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1519'/>
@@ -16338,9 +16338,9 @@
     <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
     <qualified-type-def type-id='type-id-123' const='yes' id='type-id-1524'/>
     <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
-    <qualified-type-def type-id='type-id-516' const='yes' id='type-id-559'/>
-    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1526'/>
+    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-1526'/>
     <qualified-type-def type-id='type-id-129' const='yes' id='type-id-1527'/>
     <pointer-type-def type-id='type-id-1527' size-in-bits='64' id='type-id-1528'/>
     <qualified-type-def type-id='type-id-436' const='yes' id='type-id-438'/>
@@ -16358,38 +16358,38 @@
     <qualified-type-def type-id='type-id-470' const='yes' id='type-id-1533'/>
     <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
     <qualified-type-def type-id='type-id-1534' const='yes' id='type-id-1535'/>
-    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1536'/>
+    <qualified-type-def type-id='type-id-546' const='yes' id='type-id-1536'/>
     <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
     <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
     <qualified-type-def type-id='type-id-471' const='yes' id='type-id-582'/>
     <pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-580'/>
-    <qualified-type-def type-id='type-id-503' const='yes' id='type-id-1539'/>
+    <qualified-type-def type-id='type-id-502' const='yes' id='type-id-1539'/>
     <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
-    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1541'/>
+    <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1541'/>
     <reference-type-def kind='lvalue' type-id='type-id-1541' size-in-bits='64' id='type-id-1542'/>
     <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-1543'/>
-    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-560' size-in-bits='64' id='type-id-528'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-531'/>
     <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1544'/>
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1545'/>
-    <qualified-type-def type-id='type-id-548' const='yes' id='type-id-1546'/>
+    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1546'/>
     <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1547'/>
-    <qualified-type-def type-id='type-id-549' const='yes' id='type-id-1548'/>
+    <qualified-type-def type-id='type-id-548' const='yes' id='type-id-1548'/>
     <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-1550'/>
-    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-561'/>
-    <reference-type-def kind='lvalue' type-id='type-id-561' size-in-bits='64' id='type-id-535'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-563'/>
+    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-538'/>
     <qualified-type-def type-id='type-id-550' const='yes' id='type-id-1551'/>
     <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
-    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-498'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1242'/>
-    <qualified-type-def type-id='type-id-515' const='yes' id='type-id-562'/>
-    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-538'/>
-    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-1553'/>
-    <qualified-type-def type-id='type-id-514' const='yes' id='type-id-563'/>
-    <reference-type-def kind='lvalue' type-id='type-id-563' size-in-bits='64' id='type-id-541'/>
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1554'/>
+    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-518'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1242'/>
+    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-541'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-1553'/>
+    <qualified-type-def type-id='type-id-512' const='yes' id='type-id-565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-544'/>
+    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-1554'/>
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-3'/>
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-2'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-110'/>
@@ -16422,7 +16422,7 @@
     <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-1578'/>
     <qualified-type-def type-id='type-id-4' volatile='yes' id='type-id-1570'/>
     <namespace-decl name='__sanitizer'>
-      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-545'>
+      <class-decl name='CommonFlags' size-in-bits='384' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='23' column='1' id='type-id-527'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='symbolize' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='25' column='1'/>
         </data-member>
@@ -16583,7 +16583,7 @@
           <var-decl name='val_dont_use' type-id='type-id-158' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-521'>
+      <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-520'>
         <member-type access='public'>
           <typedef-decl name='ThreadCallback' type-id='type-id-553' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-552'/>
         </member-type>
@@ -16631,7 +16631,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadRegistry' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-558'/>
             <parameter type-id='type-id-284'/>
             <parameter type-id='type-id-284'/>
@@ -16640,7 +16640,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ThreadRegistry' mangled-name='_ZN11__sanitizer14ThreadRegistryC2EPFPNS_17ThreadContextBaseEjEjj' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-513' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-558'/>
             <parameter type-id='type-id-284'/>
             <parameter type-id='type-id-284'/>
@@ -16676,7 +16676,7 @@
       </class-decl>
       <class-decl name='TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;' size-in-bits='131136' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='594' column='1' id='type-id-132'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='map1_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
+          <var-decl name='map1_' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='648' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='131072'>
           <var-decl name='mu_' type-id='type-id-119' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='649' column='1'/>
@@ -16738,17 +16738,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-146'>
+      <class-decl name='SizeClassMap&lt;17ul, 64ul, 14ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-145'>
         <member-type access='public'>
           <class-decl name='TransferBatch' size-in-bits='4224' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-125'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='next' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-147' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-146' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -16844,10 +16844,10 @@
       </class-decl>
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator32&lt;0ul, 140737488355328ull, 16ul, __sanitizer::SizeClassMap&lt;17ul, 64ul, 14ul&gt;, 24ul, __sanitizer::TwoLevelByteMap&lt;2048ull, 4096ull, __sanitizer::NoOpMapUnmapCallback&gt;, __sanitizer::NoOpMapUnmapCallback&gt; &gt;' size-in-bits='441344' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-127'>
         <member-type access='public'>
-          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-142'/>
+          <typedef-decl name='Batch' type-id='type-id-125' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-141'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-143'>
+          <class-decl name='PerClass' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-142'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
             </data-member>
@@ -16855,7 +16855,7 @@
               <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -16863,7 +16863,7 @@
           <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='per_class_' type-id='type-id-145' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='440960'>
           <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
@@ -16875,10 +16875,10 @@
           <var-decl name='size_' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='first_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
+          <var-decl name='first_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='last_' type-id='type-id-141' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
+          <var-decl name='last_' type-id='type-id-140' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_list.h' line='117' column='1'/>
         </data-member>
       </class-decl>
       <typedef-decl name='InternalAllocatorCache' type-id='type-id-127' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator_internal.h' line='43' column='1' id='type-id-477'/>
@@ -16892,7 +16892,7 @@
       </class-decl>
       <class-decl name='SizeClassAllocatorLocalCache&lt;__sanitizer::SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt; &gt;' size-in-bits='875520' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='889' column='1' id='type-id-501'>
         <member-type access='public'>
-          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-506'>
+          <class-decl name='PerClass' size-in-bits='16512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='942' column='1' id='type-id-504'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='943' column='1'/>
             </data-member>
@@ -16900,24 +16900,24 @@
               <var-decl name='max_count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='944' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-507' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
+              <var-decl name='batch' type-id='type-id-505' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='945' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-508'/>
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='941' column='1' id='type-id-506'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='kNumClasses' type-id='type-id-131' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='891' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='per_class_' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
+          <var-decl name='per_class_' type-id='type-id-508' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='947' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='875136'>
           <var-decl name='stats_' type-id='type-id-123' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='948' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-516'>
+      <class-decl name='InternalMmapVector&lt;__tsan::FiredSuppression&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-514'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='data_' type-id='type-id-522' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='382' column='1'/>
         </data-member>
@@ -16950,17 +16950,17 @@
         </member-function>
       </class-decl>
       <typedef-decl name='ThreadContextFactory' type-id='type-id-571' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='71' column='1' id='type-id-558'/>
-      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-543'>
+      <class-decl name='SizeClassMap&lt;17ul, 128ul, 16ul&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='89' column='1' id='type-id-525'>
         <member-type access='public'>
-          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-509'>
+          <class-decl name='TransferBatch' size-in-bits='8320' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='103' column='1' id='type-id-507'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='next' type-id='type-id-544' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
+              <var-decl name='next' type-id='type-id-526' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='count' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='105' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='batch' type-id='type-id-144' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
+              <var-decl name='batch' type-id='type-id-143' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='106' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
@@ -17000,7 +17000,7 @@
       </class-decl>
       <class-decl name='SizeClassAllocator64&lt;137438953472000ul, 1099511627776ul, 16ul, __sanitizer::SizeClassMap&lt;17ul, 128ul, 16ul&gt;, __tsan::MapUnmapCallback&gt;' size-in-bits='8' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='305' column='1' id='type-id-1498'>
         <member-type access='public'>
-          <typedef-decl name='Batch' type-id='type-id-509' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1502'/>
+          <typedef-decl name='Batch' type-id='type-id-507' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='307' column='1' id='type-id-1502'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='AllocatorCache' type-id='type-id-501' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.h' line='310' column='1' id='type-id-1500'/>
@@ -17147,13 +17147,13 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-573'>
+      <class-decl name='MD5Hash' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='147' column='1' id='type-id-574'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='type-id-474' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_defs.h' line='148' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-517'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-545'/>
+      <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-515'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-527'/>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='enable_annotations' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='27' column='1'/>
         </data-member>
@@ -17252,7 +17252,7 @@
           <var-decl name='kInvalidTid' type-id='type-id-110' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='53' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='55' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='addr' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='56' column='1'/>
@@ -17291,11 +17291,11 @@
           <var-decl name='is_linker_init' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='67' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='next' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
+          <var-decl name='next' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='68' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncVar' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <parameter type-id='type-id-106'/>
             <parameter type-id='type-id-157'/>
             <return type-id='type-id-4'/>
@@ -17303,7 +17303,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncVar' mangled-name='_ZN6__tsan7SyncVarC2Emy' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-530' is-artificial='yes'/>
+            <parameter type-id='type-id-533' is-artificial='yes'/>
             <parameter type-id='type-id-106'/>
             <parameter type-id='type-id-157'/>
             <return type-id='type-id-4'/>
@@ -17449,27 +17449,27 @@
         </member-function>
       </class-decl>
       <typedef-decl name='AllocatorCache' type-id='type-id-501' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='133' column='1' id='type-id-476'/>
-      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-511'>
+      <class-decl name='SyncTab' size-in-bits='516672' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='85' column='1' id='type-id-509'>
         <member-type access='private'>
-          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-529'>
+          <class-decl name='Part' size-in-bits='512' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='102' column='1' id='type-id-532'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
+              <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='103' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='val' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
+              <var-decl name='val' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='104' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='pad' type-id='type-id-531' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
+              <var-decl name='pad' type-id='type-id-534' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='105' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Part' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Part' mangled-name='_ZN6__tsan7SyncTab4PartC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-532' is-artificial='yes'/>
+                <parameter type-id='type-id-535' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -17479,40 +17479,40 @@
           <var-decl name='kPartCount' type-id='type-id-110' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='110' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='tab_' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
+          <var-decl name='tab_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='111' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='516608'>
           <var-decl name='uid_gen_' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='112' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SyncTab' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
-            <parameter type-id='type-id-535'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-538'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SyncTab' mangled-name='_ZN6__tsan7SyncTabC2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~SyncTab' mangled-name='_ZN6__tsan7SyncTabD2Ev' filepath='../../.././libsanitizer/tsan/tsan_sync.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-534' is-artificial='yes'/>
+            <parameter type-id='type-id-537' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -17523,10 +17523,10 @@
           <var-decl name='initialized' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='529' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='synctab' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
+          <var-decl name='synctab' type-id='type-id-509' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='531' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516736'>
-          <var-decl name='report_mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
+          <var-decl name='report_mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='533' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516800'>
           <var-decl name='nreported' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='534' column='1'/>
@@ -17538,28 +17538,28 @@
           <var-decl name='last_symbolize_time_ns' type-id='type-id-151' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='536' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516928'>
-          <var-decl name='thread_registry' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
+          <var-decl name='thread_registry' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='538' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='516992'>
-          <var-decl name='racy_stacks' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
+          <var-decl name='racy_stacks' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='540' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517248'>
-          <var-decl name='racy_addresses' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
+          <var-decl name='racy_addresses' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='541' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517504'>
-          <var-decl name='fired_suppressions' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
+          <var-decl name='fired_suppressions' type-id='type-id-514' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='543' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='517696'>
-          <var-decl name='flags' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
+          <var-decl name='flags' type-id='type-id-515' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='545' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='518656'>
           <var-decl name='stat' type-id='type-id-479' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='547' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='546688'>
-          <var-decl name='int_alloc_cnt' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
+          <var-decl name='int_alloc_cnt' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='548' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='548160'>
-          <var-decl name='int_alloc_siz' type-id='type-id-518' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
+          <var-decl name='int_alloc_siz' type-id='type-id-516' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='549' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Context' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='527' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17606,43 +17606,43 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-512'>
+      <class-decl name='Mutex' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='37' column='1' id='type-id-510'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='state_' type-id='type-id-153' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='51' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-526'/>
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-530'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Mutex' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-528'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-531'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Mutex' mangled-name='_ZN6__tsan5MutexC2ENS_9MutexTypeENS_8StatTypeE' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
-            <parameter type-id='type-id-526'/>
-            <parameter type-id='type-id-527'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
+            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-530'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Mutex' mangled-name='_ZN6__tsan5MutexD2Ev' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-525' is-artificial='yes'/>
+            <parameter type-id='type-id-528' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -17733,42 +17733,42 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-514'>
+      <class-decl name='Vector&lt;__tsan::RacyStacks&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-512'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-542' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <parameter type-id='type-id-451'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-540' is-artificial='yes'/>
-            <parameter type-id='type-id-541'/>
+            <parameter type-id='type-id-543' is-artificial='yes'/>
+            <parameter type-id='type-id-544'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-549'>
+      <class-decl name='RacyStacks' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='504' column='1' id='type-id-548'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='hash' type-id='type-id-568' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='505' column='1'/>
         </data-member>
@@ -17808,42 +17808,42 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-515'>
+      <class-decl name='Vector&lt;__tsan::RacyAddress&gt;' size-in-bits='256' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='23' column='1' id='type-id-513'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='typ_' type-id='type-id-452' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='80' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='begin_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
+          <var-decl name='begin_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='81' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='end_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
+          <var-decl name='end_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='82' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='last_' type-id='type-id-536' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
+          <var-decl name='last_' type-id='type-id-539' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='83' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='25' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <parameter type-id='type-id-451'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
             <parameter type-id='type-id-25' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='Vector' filepath='../../.././libsanitizer/tsan/tsan_vector.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-537' is-artificial='yes'/>
-            <parameter type-id='type-id-538'/>
+            <parameter type-id='type-id-540' is-artificial='yes'/>
+            <parameter type-id='type-id-541'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-503'>
+      <class-decl name='JmpBuf' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='390' column='1' id='type-id-502'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='sp' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='391' column='1'/>
         </data-member>
@@ -17854,7 +17854,7 @@
           <var-decl name='shadow_stack_pos' type-id='type-id-472' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='393' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-548'>
+      <class-decl name='RacyAddress' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='515' column='1' id='type-id-547'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='addr_min' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='516' column='1'/>
         </data-member>
@@ -17862,7 +17862,7 @@
           <var-decl name='addr_max' type-id='type-id-106' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='517' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-547'>
+      <class-decl name='FiredSuppression' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='520' column='1' id='type-id-546'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='type' type-id='type-id-567' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='521' column='1'/>
         </data-member>
@@ -17873,7 +17873,7 @@
           <var-decl name='supp' type-id='type-id-239' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
         </data-member>
       </class-decl>
-      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-526'>
+      <enum-decl name='MutexType' filepath='../../.././libsanitizer/tsan/tsan_mutex.h' line='20' column='1' id='type-id-529'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='MutexTypeInvalid' value='0'/>
         <enumerator name='MutexTypeTrace' value='1'/>
@@ -17899,10 +17899,10 @@
           <var-decl name='pending_signal_count' type-id='type-id-25' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='124' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='pending_signals' type-id='type-id-519' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
+          <var-decl name='pending_signals' type-id='type-id-517' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='125' column='1'/>
         </data-member>
       </class-decl>
-      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-527'>
+      <enum-decl name='StatType' filepath='../../.././libsanitizer/tsan/tsan_stat.h' line='17' column='1' id='type-id-530'>
         <underlying-type type-id='type-id-62'/>
         <enumerator name='StatMop' value='0'/>
         <enumerator name='StatMopRead' value='1'/>
@@ -18366,7 +18366,7 @@
       </enum-decl>
       <function-decl name='StatInc' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-467'/>
-        <parameter type-id='type-id-527'/>
+        <parameter type-id='type-id-530'/>
         <parameter type-id='type-id-157'/>
         <return type-id='type-id-4'/>
       </function-decl>
@@ -18792,7 +18792,7 @@
       <parameter type-id='type-id-1477' name='mo' filepath='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' line='671' column='1'/>
       <return type-id='type-id-4'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-574'>
+    <function-type size-in-bits='64' id='type-id-573'>
       <parameter type-id='type-id-284'/>
       <return type-id='type-id-432'/>
     </function-type>
@@ -18862,10 +18862,10 @@
           <var-decl name='begin' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='29' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='30' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='30' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='head' type-id='type-id-530' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='31' column='1'/>
+          <var-decl name='head' type-id='type-id-533' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='31' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BlockDesc' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18983,7 +18983,7 @@
     <array-type-def dimensions='1' type-id='type-id-33' size-in-bits='4096' id='type-id-108'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-147'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='4096' id='type-id-146'>
       <subrange length='64' type-id='type-id-50' id='type-id-122'/>
     </array-type-def>
     <qualified-type-def type-id='type-id-1490' const='yes' id='type-id-1597'/>
@@ -20144,12 +20144,12 @@
       </class-decl>
       <class-decl name='GenericScopedLock&lt;__tsan::Mutex&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='85' column='1' id='type-id-1758'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='mu_' type-id='type-id-525' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
+          <var-decl name='mu_' type-id='type-id-528' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-528'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20435,15 +20435,13 @@
       <return type-id='type-id-4'/>
     </function-type>
     <pointer-type-def type-id='type-id-1781' size-in-bits='64' id='type-id-1783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1784'/>
-    <qualified-type-def type-id='type-id-1781' const='yes' id='type-id-1785'/>
     <namespace-decl name='__tsan'>
       <class-decl name='Trace' size-in-bits='9257024' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='60' column='1' id='type-id-1782'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='headers' type-id='type-id-1786' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062656'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062720'>
           <var-decl name='shadow_stack' type-id='type-id-1787' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='66' column='1'/>
@@ -20456,6 +20454,8 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1784'/>
+    <qualified-type-def type-id='type-id-1781' const='yes' id='type-id-1785'/>
     <array-type-def dimensions='1' type-id='type-id-1788' size-in-bits='5062656' id='type-id-1786'>
       <subrange length='256' type-id='type-id-50' id='type-id-194'/>
     </array-type-def>
@@ -20583,8 +20583,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-475' size-in-bits='64' id='type-id-1803'/>
     <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-1804'/>
     <qualified-type-def type-id='type-id-1805' const='yes' id='type-id-1806'/>
-    <qualified-type-def type-id='type-id-537' const='yes' id='type-id-1807'/>
-    <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1808'/>
+    <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1807'/>
+    <qualified-type-def type-id='type-id-543' const='yes' id='type-id-1808'/>
     <qualified-type-def type-id='type-id-1708' const='yes' id='type-id-1809'/>
     <qualified-type-def type-id='type-id-1710' const='yes' id='type-id-1810'/>
     <qualified-type-def type-id='type-id-1712' const='yes' id='type-id-1811'/>
@@ -20751,7 +20751,7 @@
       <subrange length='65536' type-id='type-id-50' id='type-id-1789'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-1830' size-in-bits='64' id='type-id-1831'/>
-    <qualified-type-def type-id='type-id-513' const='yes' id='type-id-1832'/>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-1832'/>
     <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1805'/>
     <pointer-type-def type-id='type-id-1781' size-in-bits='64' id='type-id-1783'/>
     <qualified-type-def type-id='type-id-1783' const='yes' id='type-id-1833'/>
@@ -20795,12 +20795,12 @@
       </enum-decl>
       <class-decl name='GenericScopedLock&lt;__sanitizer::ThreadRegistry&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='85' column='1' id='type-id-1830'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='mu_' type-id='type-id-513' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
+          <var-decl name='mu_' type-id='type-id-511' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='97' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='GenericScopedLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1831' is-artificial='yes'/>
-            <parameter type-id='type-id-513'/>
+            <parameter type-id='type-id-511'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20898,7 +20898,7 @@
           <var-decl name='headers' type-id='type-id-1786' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062656'>
-          <var-decl name='mtx' type-id='type-id-512' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
+          <var-decl name='mtx' type-id='type-id-510' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='5062720'>
           <var-decl name='shadow_stack' type-id='type-id-1787' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_trace.h' line='66' column='1'/>
@@ -21035,7 +21035,7 @@
       </class-decl>
       <function-decl name='StatSet' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='596' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-467'/>
-        <parameter type-id='type-id-527'/>
+        <parameter type-id='type-id-530'/>
         <parameter type-id='type-id-157'/>
         <return type-id='type-id-4'/>
       </function-decl>
@@ -21396,8 +21396,8 @@
     <pointer-type-def type-id='type-id-1880' size-in-bits='64' id='type-id-1881'/>
     <qualified-type-def type-id='type-id-1881' const='yes' id='type-id-1882'/>
     <qualified-type-def type-id='type-id-1792' const='yes' id='type-id-1883'/>
-    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-1884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-530' size-in-bits='64' id='type-id-1885'/>
+    <qualified-type-def type-id='type-id-537' const='yes' id='type-id-1884'/>
+    <reference-type-def kind='lvalue' type-id='type-id-533' size-in-bits='64' id='type-id-1885'/>
     <qualified-type-def type-id='type-id-1876' const='yes' id='type-id-1886'/>
     <reference-type-def kind='lvalue' type-id='type-id-1886' size-in-bits='64' id='type-id-1887'/>
     <qualified-type-def type-id='type-id-1878' const='yes' id='type-id-1888'/>
@@ -21410,12 +21410,12 @@
     <namespace-decl name='__sanitizer'>
       <class-decl name='GenericScopedReadLock&lt;__tsan::Mutex&gt;' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='104' column='1' id='type-id-1878'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='mu_' type-id='type-id-525' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='116' column='1'/>
+          <var-decl name='mu_' type-id='type-id-528' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='116' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='GenericScopedReadLock' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_mutex.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1879' is-artificial='yes'/>
-            <parameter type-id='type-id-525'/>
+            <parameter type-id='type-id-528'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index f4e98b80..3002abd0 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1893,6 +1893,13 @@
       <var-decl name='ProcessConfigureDMA' type-id='type-id-138' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
     </namespace-decl>
     <type-decl name='bool' size-in-bits='8' id='type-id-149'/>
+    <class-decl name='coibuffer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-67'/>
+    <class-decl name='coiengine' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-68'/>
+    <class-decl name='coifunction' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-69'/>
+    <class-decl name='coilibrary' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-70'/>
+    <class-decl name='coimapinst' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-71'/>
+    <class-decl name='coipipeline' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-72'/>
+    <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
     <function-type size-in-bits='64' id='type-id-85'>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-13'/>
@@ -2157,13 +2164,6 @@
     <type-decl name='int' size-in-bits='32' id='type-id-25'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-27'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
-    <class-decl name='coibuffer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-67'/>
-    <class-decl name='coiengine' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-68'/>
-    <class-decl name='coifunction' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-69'/>
-    <class-decl name='coilibrary' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-70'/>
-    <class-decl name='coimapinst' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-71'/>
-    <class-decl name='coipipeline' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-72'/>
-    <class-decl name='coiprocess' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
     <typedef-decl name='uint64_t' type-id='type-id-6' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-56'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-2'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-6'/>
@@ -11337,22 +11337,188 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <class-decl name='mutex_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='82' column='1' id='type-id-192'>
+      <data-member access='private' layout-offset-in-bits='0'>
+        <var-decl name='m_lock' type-id='type-id-1967' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='119' column='1'/>
+      </data-member>
+      <member-function access='public'>
+        <function-decl name='unlock' mangled-name='_ZN7mutex_t6unlockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t6unlockEv'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public'>
+        <function-decl name='lock' mangled-name='_ZN7mutex_t4lockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t4lockEv'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' destructor='yes'>
+        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' destructor='yes'>
+        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' destructor='yes'>
+        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' destructor='yes'>
+        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' destructor='yes'>
+        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+      <member-function access='public' constructor='yes'>
+        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+          <return type-id='type-id-154'/>
+        </function-decl>
+      </member-function>
+    </class-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Index_tuple&lt;0ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/utility' line='216' column='1' id='type-id-1130'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Index_tuple&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/utility' line='216' column='1' id='type-id-1131'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='__allocator_traits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='43' column='1' id='type-id-1224'>
+        <member-type access='protected'>
+          <typedef-decl name='__pointer' type-id='type-id-1969' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1175'/>
+        </member-type>
+        <member-type access='protected'>
+          <typedef-decl name='__c_pointer' type-id='type-id-1971' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-1970'/>
+        </member-type>
+        <member-type access='protected'>
+          <typedef-decl name='__size_type' type-id='type-id-1972' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1180'/>
+        </member-type>
+        <member-type access='public'>
+          <typedef-decl name='__rebind' type-id='type-id-1973' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1237'/>
+        </member-type>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1233'>
+        <member-type access='public'>
+          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-1974'/>
+        </member-type>
+        <data-member access='public' static='yes'>
+          <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1231'>
+        <member-type access='public'>
+          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-1975'/>
+        </member-type>
+        <data-member access='public' static='yes'>
+          <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-1279'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='first' type-id='type-id-639' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='second' type-id='type-id-149' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC1IS2_bLb1EEEOT_OT0_'>
+            <parameter type-id='type-id-1976' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1634' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <return type-id='type-id-154'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-1342'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='first' type-id='type-id-645' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='second' type-id='type-id-149' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
+            <parameter type-id='type-id-1977' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <return type-id='type-id-154'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
+            <parameter type-id='type-id-1977' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
+            <return type-id='type-id-154'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='76' column='1' id='type-id-1132'/>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='789' column='1' id='type-id-1134'/>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;long unsigned int const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1133'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1967'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1978'/>
         <member-function access='private'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKmEEC1EOS2_'>
-            <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1128'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC1IvLb1EEES1_'>
-            <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11361,17 +11527,17 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1195'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1969'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1980'/>
         <member-function access='private'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC1EOS4_'>
-            <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1194'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC2IvLb1EEES3_'>
-            <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11408,33 +11574,33 @@
     <qualified-type-def type-id='type-id-149' const='yes' id='type-id-264'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-198'/>
     <qualified-type-def type-id='type-id-506' const='yes' id='type-id-1714'/>
-    <qualified-type-def type-id='type-id-1971' const='yes' id='type-id-1542'/>
-    <qualified-type-def type-id='type-id-1972' id='type-id-1544'/>
-    <qualified-type-def type-id='type-id-1973' const='yes' id='type-id-1644'/>
-    <qualified-type-def type-id='type-id-1974' id='type-id-1645'/>
-    <qualified-type-def type-id='type-id-1975' id='type-id-1647'/>
-    <qualified-type-def type-id='type-id-1976' const='yes' id='type-id-1678'/>
-    <qualified-type-def type-id='type-id-1977' id='type-id-1679'/>
-    <qualified-type-def type-id='type-id-1978' id='type-id-1680'/>
-    <qualified-type-def type-id='type-id-1979' const='yes' id='type-id-1494'/>
-    <qualified-type-def type-id='type-id-1980' id='type-id-1495'/>
-    <qualified-type-def type-id='type-id-1981' const='yes' id='type-id-1620'/>
-    <qualified-type-def type-id='type-id-1982' id='type-id-1621'/>
-    <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1628'/>
-    <qualified-type-def type-id='type-id-1984' id='type-id-1629'/>
+    <qualified-type-def type-id='type-id-1982' const='yes' id='type-id-1542'/>
+    <qualified-type-def type-id='type-id-1983' id='type-id-1544'/>
+    <qualified-type-def type-id='type-id-1984' const='yes' id='type-id-1644'/>
+    <qualified-type-def type-id='type-id-1985' id='type-id-1645'/>
+    <qualified-type-def type-id='type-id-1986' id='type-id-1647'/>
+    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-1988' id='type-id-1679'/>
+    <qualified-type-def type-id='type-id-1989' id='type-id-1680'/>
+    <qualified-type-def type-id='type-id-1990' const='yes' id='type-id-1494'/>
+    <qualified-type-def type-id='type-id-1991' id='type-id-1495'/>
+    <qualified-type-def type-id='type-id-1992' const='yes' id='type-id-1620'/>
+    <qualified-type-def type-id='type-id-1993' id='type-id-1621'/>
+    <qualified-type-def type-id='type-id-1994' const='yes' id='type-id-1628'/>
+    <qualified-type-def type-id='type-id-1995' id='type-id-1629'/>
     <qualified-type-def type-id='type-id-512' const='yes' id='type-id-1601'/>
     <qualified-type-def type-id='type-id-515' id='type-id-1602'/>
     <qualified-type-def type-id='type-id-535' const='yes' id='type-id-1139'/>
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-1163'/>
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-1276'/>
-    <qualified-type-def type-id='type-id-1985' const='yes' id='type-id-1259'/>
+    <qualified-type-def type-id='type-id-1996' const='yes' id='type-id-1259'/>
     <qualified-type-def type-id='type-id-551' id='type-id-1278'/>
     <qualified-type-def type-id='type-id-558' const='yes' id='type-id-1343'/>
-    <qualified-type-def type-id='type-id-1986' const='yes' id='type-id-1325'/>
+    <qualified-type-def type-id='type-id-1997' const='yes' id='type-id-1325'/>
     <qualified-type-def type-id='type-id-567' id='type-id-1341'/>
     <qualified-type-def type-id='type-id-573' id='type-id-1222'/>
     <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1220'/>
-    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1198'/>
+    <qualified-type-def type-id='type-id-1998' const='yes' id='type-id-1198'/>
     <qualified-type-def type-id='type-id-583' id='type-id-1219'/>
     <qualified-type-def type-id='type-id-590' const='yes' id='type-id-1441'/>
     <qualified-type-def type-id='type-id-599' id='type-id-1440'/>
@@ -11471,7 +11637,7 @@
     <qualified-type-def type-id='type-id-756' id='type-id-1762'/>
     <qualified-type-def type-id='type-id-804' id='type-id-1160'/>
     <qualified-type-def type-id='type-id-816' const='yes' id='type-id-1712'/>
-    <qualified-type-def type-id='type-id-1988' const='yes' id='type-id-1710'/>
+    <qualified-type-def type-id='type-id-1999' const='yes' id='type-id-1710'/>
     <qualified-type-def type-id='type-id-829' const='yes' id='type-id-1635'/>
     <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1638'/>
     <qualified-type-def type-id='type-id-836' id='type-id-1214'/>
@@ -11483,7 +11649,7 @@
     <qualified-type-def type-id='type-id-859' const='yes' id='type-id-1656'/>
     <qualified-type-def type-id='type-id-865' id='type-id-1658'/>
     <qualified-type-def type-id='type-id-874' id='type-id-1199'/>
-    <qualified-type-def type-id='type-id-1989' id='type-id-1221'/>
+    <qualified-type-def type-id='type-id-2000' id='type-id-1221'/>
     <qualified-type-def type-id='type-id-897' const='yes' id='type-id-1702'/>
     <qualified-type-def type-id='type-id-903' id='type-id-1700'/>
     <qualified-type-def type-id='type-id-909' const='yes' id='type-id-1691'/>
@@ -11493,32 +11659,32 @@
     <type-decl name='long int' size-in-bits='64' id='type-id-191'/>
     <type-decl name='long long int' size-in-bits='64' id='type-id-247'/>
     <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1713'/>
-    <qualified-type-def type-id='type-id-1990' const='yes' id='type-id-1543'/>
-    <qualified-type-def type-id='type-id-1991' const='yes' id='type-id-1646'/>
-    <qualified-type-def type-id='type-id-1992' const='yes' id='type-id-1677'/>
-    <qualified-type-def type-id='type-id-1993' const='yes' id='type-id-1493'/>
-    <qualified-type-def type-id='type-id-1994' const='yes' id='type-id-1618'/>
+    <qualified-type-def type-id='type-id-2001' const='yes' id='type-id-1543'/>
+    <qualified-type-def type-id='type-id-2002' const='yes' id='type-id-1646'/>
+    <qualified-type-def type-id='type-id-2003' const='yes' id='type-id-1677'/>
+    <qualified-type-def type-id='type-id-2004' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-2005' const='yes' id='type-id-1618'/>
     <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1619'/>
-    <qualified-type-def type-id='type-id-1995' const='yes' id='type-id-1627'/>
+    <qualified-type-def type-id='type-id-2006' const='yes' id='type-id-1627'/>
     <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1600'/>
-    <qualified-type-def type-id='type-id-1996' const='yes' id='type-id-1609'/>
+    <qualified-type-def type-id='type-id-2007' const='yes' id='type-id-1609'/>
     <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1630'/>
     <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1144'/>
     <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1152'/>
     <qualified-type-def type-id='type-id-940' id='type-id-1258'/>
     <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1275'/>
-    <qualified-type-def type-id='type-id-1997' id='type-id-1277'/>
-    <qualified-type-def type-id='type-id-1998' const='yes' id='type-id-1262'/>
+    <qualified-type-def type-id='type-id-2008' id='type-id-1277'/>
+    <qualified-type-def type-id='type-id-2009' const='yes' id='type-id-1262'/>
     <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1264'/>
     <qualified-type-def type-id='type-id-947' id='type-id-1324'/>
     <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1339'/>
-    <qualified-type-def type-id='type-id-1999' id='type-id-1340'/>
-    <qualified-type-def type-id='type-id-2000' const='yes' id='type-id-1328'/>
+    <qualified-type-def type-id='type-id-2010' id='type-id-1340'/>
+    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-1328'/>
     <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1334'/>
     <qualified-type-def type-id='type-id-954' id='type-id-1197'/>
     <qualified-type-def type-id='type-id-955' const='yes' id='type-id-1216'/>
-    <qualified-type-def type-id='type-id-2001' id='type-id-1218'/>
-    <qualified-type-def type-id='type-id-2002' const='yes' id='type-id-1201'/>
+    <qualified-type-def type-id='type-id-2012' id='type-id-1218'/>
+    <qualified-type-def type-id='type-id-2013' const='yes' id='type-id-1201'/>
     <qualified-type-def type-id='type-id-958' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1213'/>
     <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1439'/>
@@ -11527,22 +11693,22 @@
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1370'/>
     <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1254'/>
     <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1469'/>
-    <qualified-type-def type-id='type-id-2003' id='type-id-1634'/>
+    <qualified-type-def type-id='type-id-2014' id='type-id-1634'/>
     <qualified-type-def type-id='type-id-976' const='yes' id='type-id-1168'/>
-    <qualified-type-def type-id='type-id-2004' id='type-id-1637'/>
+    <qualified-type-def type-id='type-id-2015' id='type-id-1637'/>
     <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1377'/>
     <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1248'/>
     <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1462'/>
     <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1161'/>
-    <qualified-type-def type-id='type-id-2005' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-2016' id='type-id-1570'/>
     <qualified-type-def type-id='type-id-987' const='yes' id='type-id-1380'/>
-    <qualified-type-def type-id='type-id-2006' id='type-id-1567'/>
+    <qualified-type-def type-id='type-id-2017' id='type-id-1567'/>
     <qualified-type-def type-id='type-id-989' const='yes' id='type-id-1156'/>
-    <qualified-type-def type-id='type-id-2007' id='type-id-1569'/>
+    <qualified-type-def type-id='type-id-2018' id='type-id-1569'/>
     <qualified-type-def type-id='type-id-991' const='yes' id='type-id-1154'/>
-    <qualified-type-def type-id='type-id-2008' id='type-id-1568'/>
-    <qualified-type-def type-id='type-id-2009' id='type-id-1566'/>
-    <qualified-type-def type-id='type-id-2010' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-2019' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-2020' id='type-id-1566'/>
+    <qualified-type-def type-id='type-id-2021' id='type-id-1565'/>
     <qualified-type-def type-id='type-id-994' const='yes' id='type-id-1727'/>
     <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1726'/>
     <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1720'/>
@@ -11572,7 +11738,7 @@
     <qualified-type-def type-id='type-id-1087' id='type-id-1709'/>
     <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1711'/>
     <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1707'/>
-    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-1708'/>
+    <qualified-type-def type-id='type-id-2022' const='yes' id='type-id-1708'/>
     <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1667'/>
     <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1657'/>
     <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1127'/>
@@ -11586,175 +11752,9 @@
     <qualified-type-def type-id='type-id-1116' id='type-id-1701'/>
     <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1688'/>
     <qualified-type-def type-id='type-id-1119' id='type-id-1689'/>
-    <qualified-type-def type-id='type-id-2012' id='type-id-1129'/>
-    <qualified-type-def type-id='type-id-2013' id='type-id-1128'/>
-    <qualified-type-def type-id='type-id-2014' id='type-id-1194'/>
-    <class-decl name='mutex_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='82' column='1' id='type-id-192'>
-      <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='m_lock' type-id='type-id-2015' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='119' column='1'/>
-      </data-member>
-      <member-function access='public'>
-        <function-decl name='unlock' mangled-name='_ZN7mutex_t6unlockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t6unlockEv'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public'>
-        <function-decl name='lock' mangled-name='_ZN7mutex_t4lockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t4lockEv'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' destructor='yes'>
-        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' destructor='yes'>
-        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' destructor='yes'>
-        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' destructor='yes'>
-        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' destructor='yes'>
-        <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-      <member-function access='public' constructor='yes'>
-        <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
-          <return type-id='type-id-154'/>
-        </function-decl>
-      </member-function>
-    </class-decl>
-    <namespace-decl name='std'>
-      <class-decl name='_Index_tuple&lt;0ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/utility' line='216' column='1' id='type-id-1130'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='_Index_tuple&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/utility' line='216' column='1' id='type-id-1131'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='__allocator_traits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='43' column='1' id='type-id-1224'>
-        <member-type access='protected'>
-          <typedef-decl name='__pointer' type-id='type-id-2017' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1175'/>
-        </member-type>
-        <member-type access='protected'>
-          <typedef-decl name='__c_pointer' type-id='type-id-2019' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-2018'/>
-        </member-type>
-        <member-type access='protected'>
-          <typedef-decl name='__size_type' type-id='type-id-2020' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1180'/>
-        </member-type>
-        <member-type access='public'>
-          <typedef-decl name='__rebind' type-id='type-id-2021' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1237'/>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1233'>
-        <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-2022'/>
-        </member-type>
-        <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1231'>
-        <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-2023'/>
-        </member-type>
-        <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-1279'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-639' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-149' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC1IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2024' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1634' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <return type-id='type-id-154'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='128' column='1' id='type-id-1342'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-645' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='133' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-149' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='134' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2025' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <return type-id='type-id-154'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2025' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
-            <return type-id='type-id-154'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='piecewise_construct_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='76' column='1' id='type-id-1132'/>
-    </namespace-decl>
+    <qualified-type-def type-id='type-id-2023' id='type-id-1129'/>
+    <qualified-type-def type-id='type-id-2024' id='type-id-1128'/>
+    <qualified-type-def type-id='type-id-2025' id='type-id-1194'/>
     <typedef-decl name='int64_t' type-id='type-id-191' filepath='/usr/include/sys/types.h' line='197' column='1' id='type-id-227'/>
     <typedef-decl name='size_t' type-id='type-id-6' filepath='/export/users/iverbin/gcc_build_host/gcc/include/stddef.h' line='216' column='1' id='type-id-244'/>
     <namespace-decl name='std'>
@@ -11772,75 +11772,25 @@
     <qualified-type-def type-id='type-id-2028' const='yes' id='type-id-1965'/>
     <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-1963'/>
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-1964'/>
-    <qualified-type-def type-id='type-id-2029' const='yes' id='type-id-1966'/>
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-1971'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2031' size-in-bits='64' id='type-id-1972'/>
-    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-1973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2033' size-in-bits='64' id='type-id-1974'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2034' size-in-bits='64' id='type-id-1975'/>
-    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-1976'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2036' size-in-bits='64' id='type-id-1977'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2037' size-in-bits='64' id='type-id-1978'/>
-    <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-1979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2039' size-in-bits='64' id='type-id-1980'/>
-    <pointer-type-def type-id='type-id-2040' size-in-bits='64' id='type-id-1981'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2041' size-in-bits='64' id='type-id-1982'/>
-    <pointer-type-def type-id='type-id-2042' size-in-bits='64' id='type-id-1983'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2043' size-in-bits='64' id='type-id-1984'/>
-    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-1985'/>
-    <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-1986'/>
-    <pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-1987'/>
-    <pointer-type-def type-id='type-id-2047' size-in-bits='64' id='type-id-1988'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2048' size-in-bits='64' id='type-id-1989'/>
-    <qualified-type-def type-id='type-id-2049' const='yes' id='type-id-2016'/>
-    <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-1990'/>
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1991'/>
-    <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-1992'/>
-    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-1993'/>
-    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-1994'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1995'/>
-    <pointer-type-def type-id='type-id-1605' size-in-bits='64' id='type-id-1996'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1257' size-in-bits='64' id='type-id-1997'/>
-    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-1998'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1999'/>
-    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-2000'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-2001'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-2002'/>
-    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-2003'/>
-    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-2004'/>
-    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-2005'/>
-    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-2006'/>
-    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-2007'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-2008'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2050' size-in-bits='64' id='type-id-2009'/>
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-2010'/>
-    <pointer-type-def type-id='type-id-1706' size-in-bits='64' id='type-id-2011'/>
-    <qualified-type-def type-id='type-id-2051' const='yes' id='type-id-2024'/>
-    <qualified-type-def type-id='type-id-2052' const='yes' id='type-id-2025'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-2012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2013'/>
-    <qualified-type-def type-id='type-id-2053' const='yes' id='type-id-1968'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2014'/>
-    <qualified-type-def type-id='type-id-2054' const='yes' id='type-id-1970'/>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0ul, long unsigned int const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1967'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2055'/>
+      <class-decl name='_Tuple_impl&lt;0ul, long unsigned int const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1978'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2029'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEEC2EOS2_'>
-            <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-2057' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
+            <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2031' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEE7_M_headERS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEE7_M_headERS2_'>
-            <parameter type-id='type-id-2057' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
+            <parameter type-id='type-id-2031' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
             <return type-id='type-id-920'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKmEEC2ES1_'>
-            <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11848,31 +11798,81 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1969'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2058'/>
+      <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1980'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2032'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKPKvEEC1EOS4_'>
-            <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-2060' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
+            <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2034' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEE7_M_headERS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEE7_M_headERS4_'>
-            <parameter type-id='type-id-2060' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
+            <parameter type-id='type-id-2034' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
             <return type-id='type-id-1124'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEEC2ES3_'>
-            <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <typedef-decl name='pthread_mutex_t' type-id='type-id-2061' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-2015'/>
+    <qualified-type-def type-id='type-id-2035' const='yes' id='type-id-1966'/>
+    <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-1982'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2037' size-in-bits='64' id='type-id-1983'/>
+    <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-1984'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2039' size-in-bits='64' id='type-id-1985'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2040' size-in-bits='64' id='type-id-1986'/>
+    <pointer-type-def type-id='type-id-2041' size-in-bits='64' id='type-id-1987'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2042' size-in-bits='64' id='type-id-1988'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2043' size-in-bits='64' id='type-id-1989'/>
+    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-1990'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2045' size-in-bits='64' id='type-id-1991'/>
+    <pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-1992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2047' size-in-bits='64' id='type-id-1993'/>
+    <pointer-type-def type-id='type-id-2048' size-in-bits='64' id='type-id-1994'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2049' size-in-bits='64' id='type-id-1995'/>
+    <pointer-type-def type-id='type-id-2050' size-in-bits='64' id='type-id-1996'/>
+    <pointer-type-def type-id='type-id-2051' size-in-bits='64' id='type-id-1997'/>
+    <pointer-type-def type-id='type-id-2052' size-in-bits='64' id='type-id-1998'/>
+    <pointer-type-def type-id='type-id-2053' size-in-bits='64' id='type-id-1999'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2054' size-in-bits='64' id='type-id-2000'/>
+    <qualified-type-def type-id='type-id-2055' const='yes' id='type-id-1968'/>
+    <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-2001'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-2002'/>
+    <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-2003'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-2004'/>
+    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-2005'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-2006'/>
+    <pointer-type-def type-id='type-id-1605' size-in-bits='64' id='type-id-2007'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1257' size-in-bits='64' id='type-id-2008'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-2009'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-2010'/>
+    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-2011'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-2012'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-2013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-2014'/>
+    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-2015'/>
+    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-2016'/>
+    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-2017'/>
+    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-2018'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-2019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2056' size-in-bits='64' id='type-id-2020'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-2021'/>
+    <pointer-type-def type-id='type-id-1706' size-in-bits='64' id='type-id-2022'/>
+    <qualified-type-def type-id='type-id-2057' const='yes' id='type-id-1976'/>
+    <qualified-type-def type-id='type-id-2058' const='yes' id='type-id-1977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-2023'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2024'/>
+    <qualified-type-def type-id='type-id-2059' const='yes' id='type-id-1979'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2025'/>
+    <qualified-type-def type-id='type-id-2060' const='yes' id='type-id-1981'/>
+    <typedef-decl name='pthread_mutex_t' type-id='type-id-2061' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-1967'/>
     <namespace-decl name='std'>
       <typedef-decl name='__detected_or_t_' type-id='type-id-1226' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2453' column='1' id='type-id-2026'/>
     </namespace-decl>
@@ -11886,14 +11886,14 @@
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-2019'/>
+          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-1971'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2017'/>
+          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1969'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11902,7 +11902,7 @@
         <member-type access='public'>
           <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2064'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2021'/>
+              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1973'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -11911,79 +11911,25 @@
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2020'/>
+          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1972'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-2028'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2065'/>
-        <member-type access='private'>
-          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2064'>
-            <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2021'/>
-            </member-type>
-          </class-decl>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2020'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2017'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-2019'/>
-        </member-type>
-        <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-156' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2066'/>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <pointer-type-def type-id='type-id-2067' size-in-bits='64' id='type-id-2029'/>
-    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-2030'/>
-    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-2031'/>
-    <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-2032'/>
-    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-2033'/>
-    <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-2034'/>
-    <qualified-type-def type-id='type-id-1671' const='yes' id='type-id-2035'/>
-    <qualified-type-def type-id='type-id-1672' const='yes' id='type-id-2036'/>
-    <qualified-type-def type-id='type-id-1674' const='yes' id='type-id-2037'/>
-    <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-2038'/>
-    <qualified-type-def type-id='type-id-1489' const='yes' id='type-id-2039'/>
-    <qualified-type-def type-id='type-id-1613' const='yes' id='type-id-2040'/>
-    <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-2041'/>
-    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-2042'/>
-    <qualified-type-def type-id='type-id-1623' const='yes' id='type-id-2043'/>
-    <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-2044'/>
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-2045'/>
-    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-2046'/>
-    <qualified-type-def type-id='type-id-1706' const='yes' id='type-id-2047'/>
-    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-2048'/>
-    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-2049'/>
-    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-2050'/>
-    <qualified-type-def type-id='type-id-2068' id='type-id-2057'/>
-    <qualified-type-def type-id='type-id-2069' const='yes' id='type-id-2056'/>
-    <qualified-type-def type-id='type-id-2070' id='type-id-2060'/>
-    <qualified-type-def type-id='type-id-2071' const='yes' id='type-id-2059'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-2051'/>
-    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-2052'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2053'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2054'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;0ul, long unsigned int const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2055'>
+      <class-decl name='_Head_base&lt;0ul, long unsigned int const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2029'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='147' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKmLb0EE7_M_headERS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKmLb0EE7_M_headERS2_'>
-            <parameter type-id='type-id-2072' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
+            <parameter type-id='type-id-2065' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
             <return type-id='type-id-920'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKmLb0EEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKmLb0EEC2ES1_'>
-            <parameter type-id='type-id-2073' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2066' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -11991,25 +11937,79 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;0ul, void const* const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2058'>
+      <class-decl name='_Head_base&lt;0ul, void const* const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2032'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1442' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='147' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EE7_M_headERS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-2074' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
+            <parameter type-id='type-id-2067' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
             <return type-id='type-id-1124'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC1ES3_'>
-            <parameter type-id='type-id-2075' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2068' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2069'/>
+        <member-type access='private'>
+          <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2064'>
+            <member-type access='public'>
+              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1973'/>
+            </member-type>
+          </class-decl>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1972'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1969'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-1971'/>
+        </member-type>
+        <member-type access='private'>
+          <typedef-decl name='value_type' type-id='type-id-156' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2070'/>
+        </member-type>
+      </class-decl>
+    </namespace-decl>
+    <pointer-type-def type-id='type-id-2071' size-in-bits='64' id='type-id-2035'/>
+    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-2036'/>
+    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-2037'/>
+    <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-2038'/>
+    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-2039'/>
+    <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-2040'/>
+    <qualified-type-def type-id='type-id-1671' const='yes' id='type-id-2041'/>
+    <qualified-type-def type-id='type-id-1672' const='yes' id='type-id-2042'/>
+    <qualified-type-def type-id='type-id-1674' const='yes' id='type-id-2043'/>
+    <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-2044'/>
+    <qualified-type-def type-id='type-id-1489' const='yes' id='type-id-2045'/>
+    <qualified-type-def type-id='type-id-1613' const='yes' id='type-id-2046'/>
+    <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-2047'/>
+    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-2048'/>
+    <qualified-type-def type-id='type-id-1623' const='yes' id='type-id-2049'/>
+    <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-2050'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-2051'/>
+    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-2052'/>
+    <qualified-type-def type-id='type-id-1706' const='yes' id='type-id-2053'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-2054'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-2055'/>
+    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-2056'/>
+    <qualified-type-def type-id='type-id-2072' id='type-id-2031'/>
+    <qualified-type-def type-id='type-id-2073' const='yes' id='type-id-2030'/>
+    <qualified-type-def type-id='type-id-2074' id='type-id-2034'/>
+    <qualified-type-def type-id='type-id-2075' const='yes' id='type-id-2033'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-2057'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-2058'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2059'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2060'/>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='91' column='1' id='type-id-2061'>
       <member-type access='private'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='92' column='1' id='type-id-2076'>
@@ -12053,7 +12053,7 @@
       <subrange length='40' type-id='type-id-4' id='type-id-182'/>
     </array-type-def>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2065'>
+      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2069'>
         <member-type access='private'>
           <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2080'/>
         </member-type>
@@ -12071,23 +12071,18 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-2067'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-2071'/>
     <type-decl name='short int' size-in-bits='16' id='type-id-2077'/>
-    <qualified-type-def type-id='type-id-2087' id='type-id-2072'/>
-    <qualified-type-def type-id='type-id-2088' const='yes' id='type-id-2073'/>
-    <qualified-type-def type-id='type-id-2089' id='type-id-2074'/>
-    <qualified-type-def type-id='type-id-2090' const='yes' id='type-id-2075'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1967' size-in-bits='64' id='type-id-2068'/>
-    <pointer-type-def type-id='type-id-1967' size-in-bits='64' id='type-id-2069'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1969' size-in-bits='64' id='type-id-2070'/>
-    <pointer-type-def type-id='type-id-1969' size-in-bits='64' id='type-id-2071'/>
+    <qualified-type-def type-id='type-id-2087' id='type-id-2065'/>
+    <qualified-type-def type-id='type-id-2088' const='yes' id='type-id-2066'/>
+    <qualified-type-def type-id='type-id-2089' id='type-id-2067'/>
+    <qualified-type-def type-id='type-id-2090' const='yes' id='type-id-2068'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1978' size-in-bits='64' id='type-id-2072'/>
+    <pointer-type-def type-id='type-id-1978' size-in-bits='64' id='type-id-2073'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1980' size-in-bits='64' id='type-id-2074'/>
+    <pointer-type-def type-id='type-id-1980' size-in-bits='64' id='type-id-2075'/>
     <typedef-decl name='__pthread_list_t' type-id='type-id-2091' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-2078'/>
     <reference-type-def kind='lvalue' type-id='type-id-156' size-in-bits='64' id='type-id-2084'/>
-    <reference-type-def kind='lvalue' type-id='type-id-155' size-in-bits='64' id='type-id-2086'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2055' size-in-bits='64' id='type-id-2087'/>
-    <pointer-type-def type-id='type-id-2055' size-in-bits='64' id='type-id-2088'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2058' size-in-bits='64' id='type-id-2089'/>
-    <pointer-type-def type-id='type-id-2058' size-in-bits='64' id='type-id-2090'/>
     <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='75' column='1' id='type-id-2091'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__prev' type-id='type-id-2092' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1'/>
@@ -12096,6 +12091,11 @@
         <var-decl name='__next' type-id='type-id-2092' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='78' column='1'/>
       </data-member>
     </class-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-155' size-in-bits='64' id='type-id-2086'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2029' size-in-bits='64' id='type-id-2087'/>
+    <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2088'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2032' size-in-bits='64' id='type-id-2089'/>
+    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-2090'/>
     <pointer-type-def type-id='type-id-2091' size-in-bits='64' id='type-id-2092'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
@@ -12175,8 +12175,8 @@
     <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-2028'/>
     <qualified-type-def type-id='type-id-2028' const='yes' id='type-id-1965'/>
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-214'/>
-    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-2067'/>
-    <pointer-type-def type-id='type-id-2067' size-in-bits='64' id='type-id-2029'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-2071'/>
+    <pointer-type-def type-id='type-id-2071' size-in-bits='64' id='type-id-2035'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-150'/>
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
     <function-decl name='__offload_malloc' mangled-name='_Z16__offload_mallocmm' filepath='../../../gcc/liboffloadmic/runtime/offload_common.cpp' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16__offload_mallocmm'>
@@ -12431,28 +12431,28 @@
     <qualified-type-def type-id='type-id-2190' const='yes' id='type-id-2191'/>
     <pointer-type-def type-id='type-id-2191' size-in-bits='64' id='type-id-2192'/>
     <qualified-type-def type-id='type-id-2192' const='yes' id='type-id-2193'/>
-    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-2030'/>
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-1971'/>
-    <qualified-type-def type-id='type-id-1971' const='yes' id='type-id-1542'/>
+    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-2036'/>
+    <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-1982'/>
+    <qualified-type-def type-id='type-id-1982' const='yes' id='type-id-1542'/>
     <qualified-type-def type-id='type-id-1538' const='yes' id='type-id-2194'/>
     <reference-type-def kind='lvalue' type-id='type-id-2194' size-in-bits='64' id='type-id-2195'/>
-    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-2031'/>
-    <qualified-type-def type-id='type-id-1972' id='type-id-1544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2031' size-in-bits='64' id='type-id-1972'/>
-    <qualified-type-def type-id='type-id-1671' const='yes' id='type-id-2035'/>
-    <pointer-type-def type-id='type-id-2035' size-in-bits='64' id='type-id-1976'/>
-    <qualified-type-def type-id='type-id-1976' const='yes' id='type-id-1678'/>
-    <qualified-type-def type-id='type-id-1672' const='yes' id='type-id-2036'/>
-    <qualified-type-def type-id='type-id-1977' id='type-id-1679'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2036' size-in-bits='64' id='type-id-1977'/>
-    <qualified-type-def type-id='type-id-1674' const='yes' id='type-id-2037'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2037' size-in-bits='64' id='type-id-1978'/>
-    <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-2038'/>
-    <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-1979'/>
-    <qualified-type-def type-id='type-id-1979' const='yes' id='type-id-1494'/>
-    <qualified-type-def type-id='type-id-1489' const='yes' id='type-id-2039'/>
-    <qualified-type-def type-id='type-id-1980' id='type-id-1495'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2039' size-in-bits='64' id='type-id-1980'/>
+    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-2037'/>
+    <qualified-type-def type-id='type-id-1983' id='type-id-1544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2037' size-in-bits='64' id='type-id-1983'/>
+    <qualified-type-def type-id='type-id-1671' const='yes' id='type-id-2041'/>
+    <pointer-type-def type-id='type-id-2041' size-in-bits='64' id='type-id-1987'/>
+    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-1672' const='yes' id='type-id-2042'/>
+    <qualified-type-def type-id='type-id-1988' id='type-id-1679'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2042' size-in-bits='64' id='type-id-1988'/>
+    <qualified-type-def type-id='type-id-1674' const='yes' id='type-id-2043'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2043' size-in-bits='64' id='type-id-1989'/>
+    <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-2044'/>
+    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-1990'/>
+    <qualified-type-def type-id='type-id-1990' const='yes' id='type-id-1494'/>
+    <qualified-type-def type-id='type-id-1489' const='yes' id='type-id-2045'/>
+    <qualified-type-def type-id='type-id-1991' id='type-id-1495'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2045' size-in-bits='64' id='type-id-1991'/>
     <qualified-type-def type-id='type-id-512' const='yes' id='type-id-1601'/>
     <qualified-type-def type-id='type-id-515' id='type-id-1602'/>
     <qualified-type-def type-id='type-id-1605' const='yes' id='type-id-2196'/>
@@ -12461,9 +12461,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-2198' size-in-bits='64' id='type-id-2199'/>
     <qualified-type-def type-id='type-id-535' const='yes' id='type-id-1139'/>
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-1163'/>
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-2045'/>
-    <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-1986'/>
-    <qualified-type-def type-id='type-id-1986' const='yes' id='type-id-1325'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-2051'/>
+    <pointer-type-def type-id='type-id-2051' size-in-bits='64' id='type-id-1997'/>
+    <qualified-type-def type-id='type-id-1997' const='yes' id='type-id-1325'/>
     <qualified-type-def type-id='type-id-567' id='type-id-1341'/>
     <qualified-type-def type-id='type-id-614' const='yes' id='type-id-1372'/>
     <qualified-type-def type-id='type-id-620' id='type-id-1371'/>
@@ -12493,10 +12493,10 @@
     <qualified-type-def type-id='type-id-2218' id='type-id-2219'/>
     <reference-type-def kind='lvalue' type-id='type-id-2217' size-in-bits='64' id='type-id-2218'/>
     <qualified-type-def type-id='type-id-816' const='yes' id='type-id-1712'/>
-    <qualified-type-def type-id='type-id-1706' const='yes' id='type-id-2047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2047' size-in-bits='64' id='type-id-2220'/>
-    <pointer-type-def type-id='type-id-2047' size-in-bits='64' id='type-id-1988'/>
-    <qualified-type-def type-id='type-id-1988' const='yes' id='type-id-1710'/>
+    <qualified-type-def type-id='type-id-1706' const='yes' id='type-id-2053'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2053' size-in-bits='64' id='type-id-2220'/>
+    <pointer-type-def type-id='type-id-2053' size-in-bits='64' id='type-id-1999'/>
+    <qualified-type-def type-id='type-id-1999' const='yes' id='type-id-1710'/>
     <qualified-type-def type-id='type-id-2221' const='yes' id='type-id-2222'/>
     <pointer-type-def type-id='type-id-2222' size-in-bits='64' id='type-id-2223'/>
     <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1638'/>
@@ -12529,17 +12529,17 @@
     <qualified-type-def type-id='type-id-2250' id='type-id-2106'/>
     <reference-type-def kind='lvalue' type-id='type-id-192' size-in-bits='64' id='type-id-2250'/>
     <qualified-type-def type-id='type-id-922' const='yes' id='type-id-1713'/>
-    <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-1990'/>
-    <qualified-type-def type-id='type-id-1990' const='yes' id='type-id-1543'/>
+    <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-2001'/>
+    <qualified-type-def type-id='type-id-2001' const='yes' id='type-id-1543'/>
     <reference-type-def kind='lvalue' type-id='type-id-1538' size-in-bits='64' id='type-id-2251'/>
-    <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-1992'/>
-    <qualified-type-def type-id='type-id-1992' const='yes' id='type-id-1677'/>
+    <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-2003'/>
+    <qualified-type-def type-id='type-id-2003' const='yes' id='type-id-1677'/>
     <reference-type-def kind='lvalue' type-id='type-id-1672' size-in-bits='64' id='type-id-2252'/>
-    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-1993'/>
-    <qualified-type-def type-id='type-id-1993' const='yes' id='type-id-1493'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-2004'/>
+    <qualified-type-def type-id='type-id-2004' const='yes' id='type-id-1493'/>
     <reference-type-def kind='lvalue' type-id='type-id-1489' size-in-bits='64' id='type-id-2253'/>
     <qualified-type-def type-id='type-id-924' const='yes' id='type-id-1600'/>
-    <pointer-type-def type-id='type-id-1605' size-in-bits='64' id='type-id-1996'/>
+    <pointer-type-def type-id='type-id-1605' size-in-bits='64' id='type-id-2007'/>
     <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-2254'/>
     <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1630'/>
     <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1152'/>
@@ -12547,28 +12547,28 @@
     <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1264'/>
     <qualified-type-def type-id='type-id-947' id='type-id-1324'/>
     <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1339'/>
-    <qualified-type-def type-id='type-id-1999' id='type-id-1340'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1999'/>
-    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-2000'/>
-    <qualified-type-def type-id='type-id-2000' const='yes' id='type-id-1328'/>
+    <qualified-type-def type-id='type-id-2010' id='type-id-1340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-2010'/>
+    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-2011'/>
+    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-1328'/>
     <qualified-type-def type-id='type-id-955' const='yes' id='type-id-1216'/>
     <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1213'/>
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1370'/>
     <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1254'/>
-    <qualified-type-def type-id='type-id-2004' id='type-id-1637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-2004'/>
+    <qualified-type-def type-id='type-id-2015' id='type-id-1637'/>
+    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-2015'/>
     <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1377'/>
     <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1248'/>
     <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1161'/>
     <qualified-type-def type-id='type-id-987' const='yes' id='type-id-1380'/>
-    <qualified-type-def type-id='type-id-2006' id='type-id-1567'/>
-    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-2006'/>
+    <qualified-type-def type-id='type-id-2017' id='type-id-1567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-2017'/>
     <qualified-type-def type-id='type-id-989' const='yes' id='type-id-1156'/>
-    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-2050'/>
-    <qualified-type-def type-id='type-id-2009' id='type-id-1566'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2050' size-in-bits='64' id='type-id-2009'/>
-    <qualified-type-def type-id='type-id-2010' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-2010'/>
+    <qualified-type-def type-id='type-id-992' const='yes' id='type-id-2056'/>
+    <qualified-type-def type-id='type-id-2020' id='type-id-1566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2056' size-in-bits='64' id='type-id-2020'/>
+    <qualified-type-def type-id='type-id-2021' id='type-id-1565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-2021'/>
     <reference-type-def kind='lvalue' type-id='type-id-2204' size-in-bits='64' id='type-id-2255'/>
     <pointer-type-def type-id='type-id-2204' size-in-bits='64' id='type-id-2256'/>
     <qualified-type-def type-id='type-id-2256' const='yes' id='type-id-2257'/>
@@ -12604,8 +12604,8 @@
     <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1711'/>
     <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1707'/>
     <reference-type-def kind='lvalue' type-id='type-id-1706' size-in-bits='64' id='type-id-2279'/>
-    <pointer-type-def type-id='type-id-1706' size-in-bits='64' id='type-id-2011'/>
-    <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-1708'/>
+    <pointer-type-def type-id='type-id-1706' size-in-bits='64' id='type-id-2022'/>
+    <qualified-type-def type-id='type-id-2022' const='yes' id='type-id-1708'/>
     <pointer-type-def type-id='type-id-2221' size-in-bits='64' id='type-id-2280'/>
     <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1667'/>
     <pointer-type-def type-id='type-id-2281' size-in-bits='64' id='type-id-2282'/>
@@ -12615,8 +12615,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-2286'/>
     <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1704'/>
     <reference-type-def kind='lvalue' type-id='type-id-1342' size-in-bits='64' id='type-id-2287'/>
-    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-2052'/>
-    <qualified-type-def type-id='type-id-2052' const='yes' id='type-id-2025'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-2058'/>
+    <qualified-type-def type-id='type-id-2058' const='yes' id='type-id-1977'/>
     <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-1564'/>
     <reference-type-def kind='lvalue' type-id='type-id-2288' size-in-bits='64' id='type-id-2289'/>
     <qualified-type-def type-id='type-id-2290' id='type-id-2291'/>
@@ -13551,7 +13551,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2025' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1977' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <return type-id='type-id-154'/>
@@ -13559,7 +13559,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;PtrData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI7PtrDataEbEC2IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2025' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1977' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1637' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <return type-id='type-id-154'/>
@@ -13791,11 +13791,11 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_node_base*&amp;&gt;' mangled-name='_ZSt7forwardIRPSt18_Rb_tree_node_baseEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt18_Rb_tree_node_baseEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-2321' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2010'/>
+        <return type-id='type-id-2021'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_node&lt;PtrData&gt;*&amp;&gt;' mangled-name='_ZSt7forwardIRPSt13_Rb_tree_nodeI7PtrDataEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt13_Rb_tree_nodeI7PtrDataEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2318' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2006'/>
+        <return type-id='type-id-2017'/>
       </function-decl>
       <function-decl name='__sort&lt;__gnu_cxx::__normal_iterator&lt;const VarTable::Entry**, std::vector&lt;const VarTable::Entry*&gt; &gt;, __gnu_cxx::__ops::_Iter_comp_iter&lt;bool (*)(const VarTable::Entry*, const VarTable::Entry*)&gt; &gt;' mangled-name='_ZSt6__sortIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_algo.h' line='1958' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt6__sortIN9__gnu_cxx17__normal_iteratorIPPKN8VarTable5EntryESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_'>
         <parameter type-id='type-id-2124'/>
@@ -13819,7 +13819,7 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_iterator&lt;PtrData&gt; &gt;' mangled-name='_ZSt7forwardISt17_Rb_tree_iteratorI7PtrDataEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt17_Rb_tree_iteratorI7PtrDataEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-2312' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2004'/>
+        <return type-id='type-id-2015'/>
       </function-decl>
       <function-decl name='forward&lt;PtrData&gt;' mangled-name='_ZSt7forwardI7PtrDataEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardI7PtrDataEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-2296' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
@@ -13841,7 +13841,7 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_iterator&lt;PtrData&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRSt17_Rb_tree_iteratorI7PtrDataEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSt17_Rb_tree_iteratorI7PtrDataEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2315' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2004'/>
+        <return type-id='type-id-2015'/>
       </function-decl>
       <function-decl name='move&lt;PtrData&amp;&gt;' mangled-name='_ZSt4moveIR7PtrDataEONSt16remove_referenceIT_E4typeEOS3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIR7PtrDataEONSt16remove_referenceIT_E4typeEOS3_'>
         <parameter type-id='type-id-1326' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
@@ -14178,7 +14178,19 @@
       <return type-id='type-id-150'/>
     </function-decl>
     <pointer-type-def type-id='type-id-2445' size-in-bits='64' id='type-id-2099'/>
-    <pointer-type-def type-id='type-id-2446' size-in-bits='64' id='type-id-2100'/>
+    <class-decl name='VarList' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='169' column='1' id='type-id-2446'>
+      <member-type access='private'>
+        <class-decl name='BufEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='185' column='1' id='type-id-2116'>
+          <data-member access='public' layout-offset-in-bits='0'>
+            <var-decl name='name' type-id='type-id-2447' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='186' column='1'/>
+          </data-member>
+          <data-member access='public' layout-offset-in-bits='64'>
+            <var-decl name='addr' type-id='type-id-2447' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='187' column='1'/>
+          </data-member>
+        </class-decl>
+      </member-type>
+    </class-decl>
+    <pointer-type-def type-id='type-id-2448' size-in-bits='64' id='type-id-2100'/>
     <function-type size-in-bits='64' id='type-id-2149'>
       <parameter type-id='type-id-2159'/>
       <parameter type-id='type-id-2159'/>
@@ -14189,27 +14201,14 @@
       <parameter type-id='type-id-2100'/>
       <return type-id='type-id-149'/>
     </function-type>
-    <class-decl name='VarList' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='169' column='1' id='type-id-2447'>
-      <member-type access='private'>
-        <class-decl name='BufEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='185' column='1' id='type-id-2116'>
-          <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='name' type-id='type-id-2448' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='186' column='1'/>
-          </data-member>
-          <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='addr' type-id='type-id-2448' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='187' column='1'/>
-          </data-member>
-        </class-decl>
-      </member-type>
-    </class-decl>
     <namespace-decl name='std'>
       <typedef-decl name='ptrdiff_t' type-id='type-id-191' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/c++config.h' line='197' column='1' id='type-id-2335'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-2449' const='yes' id='type-id-2446'/>
-    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2450'>
+    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2449'>
       <member-type access='private'>
         <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-2445'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='table' type-id='type-id-2451' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='48' column='1'/>
+            <var-decl name='table' type-id='type-id-2450' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='48' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='prev' type-id='type-id-2099' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='49' column='1'/>
@@ -14220,10 +14219,11 @@
         </class-decl>
       </member-type>
     </class-decl>
-    <typedef-decl name='intptr_t' type-id='type-id-191' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-2448'/>
+    <qualified-type-def type-id='type-id-2451' const='yes' id='type-id-2448'/>
+    <typedef-decl name='intptr_t' type-id='type-id-191' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-2447'/>
     <class-decl name='VarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='139' column='1' id='type-id-2452'>
       <member-type access='public'>
-        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2449'>
+        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2451'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='name' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='151' column='1'/>
           </data-member>
@@ -14236,14 +14236,14 @@
         </class-decl>
       </member-type>
     </class-decl>
-    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2450'>
+    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2449'>
       <member-type access='private'>
-        <typedef-decl name='Table' type-id='type-id-2452' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-2451'/>
+        <typedef-decl name='Table' type-id='type-id-2452' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-2450'/>
       </member-type>
     </class-decl>
     <class-decl name='VarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='139' column='1' id='type-id-2452'>
       <member-type access='public'>
-        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2449'>
+        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2451'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='name' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='151' column='1'/>
           </data-member>
@@ -15794,7 +15794,7 @@
     <qualified-type-def type-id='type-id-399' const='yes' id='type-id-222'/>
     <qualified-type-def type-id='type-id-13' const='yes' id='type-id-2991'/>
     <qualified-type-def type-id='type-id-404' const='yes' id='type-id-209'/>
-    <qualified-type-def type-id='type-id-2029' const='yes' id='type-id-1966'/>
+    <qualified-type-def type-id='type-id-2035' const='yes' id='type-id-1966'/>
     <qualified-type-def type-id='type-id-408' const='yes' id='type-id-279'/>
     <qualified-type-def type-id='type-id-410' id='type-id-1405'/>
     <qualified-type-def type-id='type-id-416' id='type-id-208'/>
@@ -15814,48 +15814,48 @@
     <qualified-type-def type-id='type-id-2995' const='yes' id='type-id-2996'/>
     <qualified-type-def type-id='type-id-2997' const='yes' id='type-id-2998'/>
     <pointer-type-def type-id='type-id-2998' size-in-bits='64' id='type-id-2999'/>
-    <qualified-type-def type-id='type-id-2055' const='yes' id='type-id-3000'/>
+    <qualified-type-def type-id='type-id-2029' const='yes' id='type-id-3000'/>
     <reference-type-def kind='lvalue' type-id='type-id-3000' size-in-bits='64' id='type-id-3001'/>
-    <qualified-type-def type-id='type-id-2058' const='yes' id='type-id-3002'/>
+    <qualified-type-def type-id='type-id-2032' const='yes' id='type-id-3002'/>
     <reference-type-def kind='lvalue' type-id='type-id-3002' size-in-bits='64' id='type-id-3003'/>
     <qualified-type-def type-id='type-id-3004' const='yes' id='type-id-3005'/>
     <pointer-type-def type-id='type-id-3005' size-in-bits='64' id='type-id-3006'/>
     <qualified-type-def type-id='type-id-3006' const='yes' id='type-id-3007'/>
-    <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-2032'/>
-    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-1973'/>
-    <qualified-type-def type-id='type-id-1973' const='yes' id='type-id-1644'/>
-    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-2033'/>
-    <qualified-type-def type-id='type-id-1974' id='type-id-1645'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2033' size-in-bits='64' id='type-id-1974'/>
-    <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-2034'/>
-    <qualified-type-def type-id='type-id-1975' id='type-id-1647'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2034' size-in-bits='64' id='type-id-1975'/>
-    <qualified-type-def type-id='type-id-1978' id='type-id-1680'/>
-    <qualified-type-def type-id='type-id-1613' const='yes' id='type-id-2040'/>
-    <pointer-type-def type-id='type-id-2040' size-in-bits='64' id='type-id-1981'/>
-    <qualified-type-def type-id='type-id-1981' const='yes' id='type-id-1620'/>
-    <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-2041'/>
-    <qualified-type-def type-id='type-id-1982' id='type-id-1621'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2041' size-in-bits='64' id='type-id-1982'/>
-    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-2042'/>
-    <pointer-type-def type-id='type-id-2042' size-in-bits='64' id='type-id-1983'/>
-    <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1628'/>
-    <qualified-type-def type-id='type-id-1623' const='yes' id='type-id-2043'/>
-    <qualified-type-def type-id='type-id-1984' id='type-id-1629'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2043' size-in-bits='64' id='type-id-1984'/>
+    <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-2038'/>
+    <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-1984'/>
+    <qualified-type-def type-id='type-id-1984' const='yes' id='type-id-1644'/>
+    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-2039'/>
+    <qualified-type-def type-id='type-id-1985' id='type-id-1645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2039' size-in-bits='64' id='type-id-1985'/>
+    <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-2040'/>
+    <qualified-type-def type-id='type-id-1986' id='type-id-1647'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2040' size-in-bits='64' id='type-id-1986'/>
+    <qualified-type-def type-id='type-id-1989' id='type-id-1680'/>
+    <qualified-type-def type-id='type-id-1613' const='yes' id='type-id-2046'/>
+    <pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-1992'/>
+    <qualified-type-def type-id='type-id-1992' const='yes' id='type-id-1620'/>
+    <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-2047'/>
+    <qualified-type-def type-id='type-id-1993' id='type-id-1621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2047' size-in-bits='64' id='type-id-1993'/>
+    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-2048'/>
+    <pointer-type-def type-id='type-id-2048' size-in-bits='64' id='type-id-1994'/>
+    <qualified-type-def type-id='type-id-1994' const='yes' id='type-id-1628'/>
+    <qualified-type-def type-id='type-id-1623' const='yes' id='type-id-2049'/>
+    <qualified-type-def type-id='type-id-1995' id='type-id-1629'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2049' size-in-bits='64' id='type-id-1995'/>
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-1276'/>
-    <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-2044'/>
-    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-1985'/>
-    <qualified-type-def type-id='type-id-1985' const='yes' id='type-id-1259'/>
+    <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-2050'/>
+    <pointer-type-def type-id='type-id-2050' size-in-bits='64' id='type-id-1996'/>
+    <qualified-type-def type-id='type-id-1996' const='yes' id='type-id-1259'/>
     <qualified-type-def type-id='type-id-551' id='type-id-1278'/>
     <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-3008'/>
     <qualified-type-def type-id='type-id-558' const='yes' id='type-id-1343'/>
     <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-3009'/>
     <qualified-type-def type-id='type-id-573' id='type-id-1222'/>
     <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1220'/>
-    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-2046'/>
-    <pointer-type-def type-id='type-id-2046' size-in-bits='64' id='type-id-1987'/>
-    <qualified-type-def type-id='type-id-1987' const='yes' id='type-id-1198'/>
+    <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-2052'/>
+    <pointer-type-def type-id='type-id-2052' size-in-bits='64' id='type-id-1998'/>
+    <qualified-type-def type-id='type-id-1998' const='yes' id='type-id-1198'/>
     <qualified-type-def type-id='type-id-583' id='type-id-1219'/>
     <qualified-type-def type-id='type-id-590' const='yes' id='type-id-1441'/>
     <qualified-type-def type-id='type-id-599' id='type-id-1440'/>
@@ -15875,9 +15875,9 @@
     <qualified-type-def type-id='type-id-3010' const='yes' id='type-id-3011'/>
     <pointer-type-def type-id='type-id-3011' size-in-bits='64' id='type-id-3012'/>
     <qualified-type-def type-id='type-id-3012' const='yes' id='type-id-3013'/>
-    <qualified-type-def type-id='type-id-1967' const='yes' id='type-id-3014'/>
+    <qualified-type-def type-id='type-id-1978' const='yes' id='type-id-3014'/>
     <reference-type-def kind='lvalue' type-id='type-id-3014' size-in-bits='64' id='type-id-3015'/>
-    <qualified-type-def type-id='type-id-1969' const='yes' id='type-id-3016'/>
+    <qualified-type-def type-id='type-id-1980' const='yes' id='type-id-3016'/>
     <reference-type-def kind='lvalue' type-id='type-id-3016' size-in-bits='64' id='type-id-3017'/>
     <qualified-type-def type-id='type-id-696' const='yes' id='type-id-1724'/>
     <qualified-type-def type-id='type-id-729' id='type-id-1776'/>
@@ -15904,9 +15904,9 @@
     <qualified-type-def type-id='type-id-1279' const='yes' id='type-id-3028'/>
     <reference-type-def kind='lvalue' type-id='type-id-3028' size-in-bits='64' id='type-id-3029'/>
     <qualified-type-def type-id='type-id-893' id='type-id-3030'/>
-    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-2048'/>
-    <qualified-type-def type-id='type-id-1989' id='type-id-1221'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2048' size-in-bits='64' id='type-id-1989'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-2054'/>
+    <qualified-type-def type-id='type-id-2000' id='type-id-1221'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2054' size-in-bits='64' id='type-id-2000'/>
     <qualified-type-def type-id='type-id-897' const='yes' id='type-id-1702'/>
     <qualified-type-def type-id='type-id-903' id='type-id-1700'/>
     <qualified-type-def type-id='type-id-909' const='yes' id='type-id-1691'/>
@@ -15918,60 +15918,60 @@
     <pointer-type-def type-id='type-id-2992' size-in-bits='64' id='type-id-3035'/>
     <qualified-type-def type-id='type-id-3035' const='yes' id='type-id-3036'/>
     <reference-type-def kind='lvalue' type-id='type-id-2997' size-in-bits='64' id='type-id-3037'/>
-    <qualified-type-def type-id='type-id-2087' id='type-id-2072'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2055' size-in-bits='64' id='type-id-2087'/>
-    <pointer-type-def type-id='type-id-2055' size-in-bits='64' id='type-id-2088'/>
-    <qualified-type-def type-id='type-id-2088' const='yes' id='type-id-2073'/>
-    <qualified-type-def type-id='type-id-2089' id='type-id-2074'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2058' size-in-bits='64' id='type-id-2089'/>
-    <pointer-type-def type-id='type-id-2058' size-in-bits='64' id='type-id-2090'/>
-    <qualified-type-def type-id='type-id-2090' const='yes' id='type-id-2075'/>
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1991'/>
-    <qualified-type-def type-id='type-id-1991' const='yes' id='type-id-1646'/>
+    <qualified-type-def type-id='type-id-2087' id='type-id-2065'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2029' size-in-bits='64' id='type-id-2087'/>
+    <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2088'/>
+    <qualified-type-def type-id='type-id-2088' const='yes' id='type-id-2066'/>
+    <qualified-type-def type-id='type-id-2089' id='type-id-2067'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2032' size-in-bits='64' id='type-id-2089'/>
+    <pointer-type-def type-id='type-id-2032' size-in-bits='64' id='type-id-2090'/>
+    <qualified-type-def type-id='type-id-2090' const='yes' id='type-id-2068'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-2002'/>
+    <qualified-type-def type-id='type-id-2002' const='yes' id='type-id-1646'/>
     <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-3038'/>
-    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-1994'/>
-    <qualified-type-def type-id='type-id-1994' const='yes' id='type-id-1618'/>
+    <pointer-type-def type-id='type-id-1613' size-in-bits='64' id='type-id-2005'/>
+    <qualified-type-def type-id='type-id-2005' const='yes' id='type-id-1618'/>
     <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1619'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1995'/>
-    <qualified-type-def type-id='type-id-1995' const='yes' id='type-id-1627'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-2006'/>
+    <qualified-type-def type-id='type-id-2006' const='yes' id='type-id-1627'/>
     <reference-type-def kind='lvalue' type-id='type-id-1623' size-in-bits='64' id='type-id-3039'/>
-    <qualified-type-def type-id='type-id-1996' const='yes' id='type-id-1609'/>
+    <qualified-type-def type-id='type-id-2007' const='yes' id='type-id-1609'/>
     <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1144'/>
     <qualified-type-def type-id='type-id-940' id='type-id-1258'/>
-    <qualified-type-def type-id='type-id-1997' id='type-id-1277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1257' size-in-bits='64' id='type-id-1997'/>
-    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-1998'/>
-    <qualified-type-def type-id='type-id-1998' const='yes' id='type-id-1262'/>
+    <qualified-type-def type-id='type-id-2008' id='type-id-1277'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1257' size-in-bits='64' id='type-id-2008'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-2009'/>
+    <qualified-type-def type-id='type-id-2009' const='yes' id='type-id-1262'/>
     <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1334'/>
     <qualified-type-def type-id='type-id-954' id='type-id-1197'/>
-    <qualified-type-def type-id='type-id-2001' id='type-id-1218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-2001'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-2002'/>
-    <qualified-type-def type-id='type-id-2002' const='yes' id='type-id-1201'/>
+    <qualified-type-def type-id='type-id-2012' id='type-id-1218'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-2012'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-2013'/>
+    <qualified-type-def type-id='type-id-2013' const='yes' id='type-id-1201'/>
     <qualified-type-def type-id='type-id-958' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1439'/>
     <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1438'/>
     <qualified-type-def type-id='type-id-968' const='yes' id='type-id-1317'/>
     <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1469'/>
-    <qualified-type-def type-id='type-id-2003' id='type-id-1634'/>
-    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-2003'/>
+    <qualified-type-def type-id='type-id-2014' id='type-id-1634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-2014'/>
     <qualified-type-def type-id='type-id-976' const='yes' id='type-id-1168'/>
     <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1462'/>
-    <qualified-type-def type-id='type-id-2005' id='type-id-1570'/>
-    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-2005'/>
-    <qualified-type-def type-id='type-id-2007' id='type-id-1569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-2007'/>
+    <qualified-type-def type-id='type-id-2016' id='type-id-1570'/>
+    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-2016'/>
+    <qualified-type-def type-id='type-id-2018' id='type-id-1569'/>
+    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-2018'/>
     <qualified-type-def type-id='type-id-991' const='yes' id='type-id-1154'/>
-    <qualified-type-def type-id='type-id-2008' id='type-id-1568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-2008'/>
-    <qualified-type-def type-id='type-id-2068' id='type-id-2057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1967' size-in-bits='64' id='type-id-2068'/>
-    <pointer-type-def type-id='type-id-1967' size-in-bits='64' id='type-id-2069'/>
-    <qualified-type-def type-id='type-id-2069' const='yes' id='type-id-2056'/>
-    <qualified-type-def type-id='type-id-2070' id='type-id-2060'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1969' size-in-bits='64' id='type-id-2070'/>
-    <pointer-type-def type-id='type-id-1969' size-in-bits='64' id='type-id-2071'/>
-    <qualified-type-def type-id='type-id-2071' const='yes' id='type-id-2059'/>
+    <qualified-type-def type-id='type-id-2019' id='type-id-1568'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-2019'/>
+    <qualified-type-def type-id='type-id-2072' id='type-id-2031'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1978' size-in-bits='64' id='type-id-2072'/>
+    <pointer-type-def type-id='type-id-1978' size-in-bits='64' id='type-id-2073'/>
+    <qualified-type-def type-id='type-id-2073' const='yes' id='type-id-2030'/>
+    <qualified-type-def type-id='type-id-2074' id='type-id-2034'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1980' size-in-bits='64' id='type-id-2074'/>
+    <pointer-type-def type-id='type-id-1980' size-in-bits='64' id='type-id-2075'/>
+    <qualified-type-def type-id='type-id-2075' const='yes' id='type-id-2033'/>
     <reference-type-def kind='lvalue' type-id='type-id-3040' size-in-bits='64' id='type-id-3041'/>
     <pointer-type-def type-id='type-id-3040' size-in-bits='64' id='type-id-3042'/>
     <qualified-type-def type-id='type-id-3042' const='yes' id='type-id-3043'/>
@@ -16020,8 +16020,8 @@
     <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1127'/>
     <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1703'/>
     <reference-type-def kind='lvalue' type-id='type-id-1279' size-in-bits='64' id='type-id-3078'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-2051'/>
-    <qualified-type-def type-id='type-id-2051' const='yes' id='type-id-2024'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-2057'/>
+    <qualified-type-def type-id='type-id-2057' const='yes' id='type-id-1976'/>
     <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1633'/>
     <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1636'/>
     <qualified-type-def type-id='type-id-1113' const='yes' id='type-id-1193'/>
@@ -16066,74 +16066,74 @@
     <qualified-type-def type-id='type-id-3137' id='type-id-3138'/>
     <reference-type-def kind='lvalue' type-id='type-id-3139' size-in-bits='64' id='type-id-3137'/>
     <qualified-type-def type-id='type-id-1116' id='type-id-1701'/>
-    <qualified-type-def type-id='type-id-2012' id='type-id-1129'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-2012'/>
+    <qualified-type-def type-id='type-id-2023' id='type-id-1129'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-2023'/>
     <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-3140'/>
-    <qualified-type-def type-id='type-id-2013' id='type-id-1128'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2013'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2053'/>
-    <qualified-type-def type-id='type-id-2053' const='yes' id='type-id-1968'/>
-    <qualified-type-def type-id='type-id-2014' id='type-id-1194'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2014'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2054'/>
-    <qualified-type-def type-id='type-id-2054' const='yes' id='type-id-1970'/>
+    <qualified-type-def type-id='type-id-2024' id='type-id-1128'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2024'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2059'/>
+    <qualified-type-def type-id='type-id-2059' const='yes' id='type-id-1979'/>
+    <qualified-type-def type-id='type-id-2025' id='type-id-1194'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2025'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2060'/>
+    <qualified-type-def type-id='type-id-2060' const='yes' id='type-id-1981'/>
     <qualified-type-def type-id='type-id-1120' id='type-id-272'/>
     <qualified-type-def type-id='type-id-1121' id='type-id-274'/>
     <qualified-type-def type-id='type-id-1124' id='type-id-1442'/>
     <namespace-decl name='std'>
       <class-decl name='tuple&lt;void const* const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1195'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1969'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1980'/>
         <member-function access='private'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC1EOS4_'>
-            <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1194'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKPKvEEC2IvLb1EEES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKPKvEEC2IvLb1EEES3_'>
-            <parameter type-id='type-id-1970' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1981' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1969'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2058'/>
+      <class-decl name='_Tuple_impl&lt;0ul, void const* const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1980'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2032'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2EOS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKPKvEEC1EOS4_'>
-            <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-2060' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
+            <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2034' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEE7_M_headERS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEE7_M_headERS4_'>
-            <parameter type-id='type-id-2060' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
+            <parameter type-id='type-id-2034' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
             <return type-id='type-id-1124'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKPKvEEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKPKvEEC2ES3_'>
-            <parameter type-id='type-id-2059' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2033' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, void const* const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2058'>
+      <class-decl name='_Head_base&lt;0ul, void const* const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2032'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1442' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='147' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EE7_M_headERS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-2074' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
+            <parameter type-id='type-id-2067' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
             <return type-id='type-id-1124'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKPKvLb0EEC2ES3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKPKvLb0EEC1ES3_'>
-            <parameter type-id='type-id-2075' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2068' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1442' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -16151,58 +16151,58 @@
       </class-decl>
       <class-decl name='__uses_alloc_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/uses_allocator.h' line='59' column='1' id='type-id-3143'/>
       <class-decl name='tuple&lt;long unsigned int const&amp;&gt;' size-in-bits='64' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='521' column='1' id='type-id-1133'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1967'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1978'/>
         <member-function access='private'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIIRKmEEC1EOS2_'>
-            <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1128'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple&lt;void, 1u&gt;' mangled-name='_ZNSt5tupleIJRKmEEC2IvLb1EEES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKmEEC1IvLb1EEES1_'>
-            <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1979' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__elements#0' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='558' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, long unsigned int const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1967'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2055'/>
+      <class-decl name='_Tuple_impl&lt;0ul, long unsigned int const&amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='338' column='1' id='type-id-1978'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2029'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2EOS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEEC2EOS2_'>
-            <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-2057' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
+            <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2031' name='__in' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='366' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEE7_M_headERS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKmEE7_M_headERS2_'>
-            <parameter type-id='type-id-2057' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
+            <parameter type-id='type-id-2031' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='346' column='1'/>
             <return type-id='type-id-920'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKmEEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIRKmEEC2ES1_'>
-            <parameter type-id='type-id-2056' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2030' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__head' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='355' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, long unsigned int const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2055'>
+      <class-decl name='_Head_base&lt;0ul, long unsigned int const&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='102' column='1' id='type-id-2029'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1217' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='147' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKmLb0EE7_M_headERS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKmLb0EE7_M_headERS2_'>
-            <parameter type-id='type-id-2072' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
+            <parameter type-id='type-id-2065' name='__b' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='142' column='1'/>
             <return type-id='type-id-920'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKmLb0EEC2ES1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKmLb0EEC2ES1_'>
-            <parameter type-id='type-id-2073' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-2066' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1217' name='__h' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='107' column='1'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -16299,7 +16299,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;const std::piecewise_construct_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-3161'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2048' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-3107'/>
+          <typedef-decl name='type' type-id='type-id-2054' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1586' column='1' id='type-id-3107'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;TargetImage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1585' column='1' id='type-id-3162'>
@@ -16326,7 +16326,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair&lt;std::_Rb_tree_iterator&lt;AutoData&gt;, bool, 1u&gt;' mangled-name='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC2IS2_bLb1EEEOT_OT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairISt17_Rb_tree_iteratorI8AutoDataEbEC1IS2_bLb1EEEOT_OT0_'>
-            <parameter type-id='type-id-2024' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1976' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1634' name='__x' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <parameter type-id='type-id-204' name='__y' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_pair.h' line='240' column='1'/>
             <return type-id='type-id-154'/>
@@ -16704,7 +16704,7 @@
         <return type-id='type-id-1124'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0ul, void const* const&amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKPKvJEERT0_RSt11_Tuple_implIXT_EJS4_DpT1_EE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKPKvJEERT0_RSt11_Tuple_implIXT_EJS4_DpT1_EE'>
-        <parameter type-id='type-id-2060' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
+        <parameter type-id='type-id-2034' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
         <return type-id='type-id-1124'/>
       </function-decl>
       <function-decl name='get&lt;0ul, long unsigned int const&amp;&gt;' mangled-name='_ZSt3getILm0EJRKmEERNSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeERS6_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIRKmEERNSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeERS6_'>
@@ -16712,7 +16712,7 @@
         <return type-id='type-id-920'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0ul, long unsigned int const&amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKmJEERT0_RSt11_Tuple_implIXT_EJS2_DpT1_EE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKmJEERT0_RSt11_Tuple_implIXT_EJS2_DpT1_EE'>
-        <parameter type-id='type-id-2057' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
+        <parameter type-id='type-id-2031' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/tuple' line='1212' column='1'/>
         <return type-id='type-id-920'/>
       </function-decl>
       <function-decl name='forward&lt;void const* const&amp;&gt;' mangled-name='_ZSt7forwardIRKPKvEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKPKvEOT_RNSt16remove_referenceIS4_E4typeE'>
@@ -16745,11 +16745,11 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_node&lt;std::pair&lt;void const* const, OffloadDescriptor*&gt; &gt;*&amp;&gt;' mangled-name='_ZSt7forwardIRPSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEEOT_RNSt16remove_referenceISB_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt13_Rb_tree_nodeISt4pairIKPKvP17OffloadDescriptorEEEOT_RNSt16remove_referenceISB_E4typeE'>
         <parameter type-id='type-id-3124' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2008'/>
+        <return type-id='type-id-2019'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;*&amp;&gt;' mangled-name='_ZSt7forwardIRPSt13_Rb_tree_nodeISt4pairIKmP6StreamEEEOT_RNSt16remove_referenceIS9_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt13_Rb_tree_nodeISt4pairIKmP6StreamEEEOT_RNSt16remove_referenceIS9_E4typeE'>
         <parameter type-id='type-id-3121' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2007'/>
+        <return type-id='type-id-2018'/>
       </function-decl>
       <function-decl name='move&lt;std::allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;&amp;&gt;' mangled-name='_ZSt4moveIRSaISt13_Rb_tree_nodeISt4pairIKmP6StreamEEEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSaISt13_Rb_tree_nodeISt4pairIKmP6StreamEEEEONSt16remove_referenceIT_E4typeEOSA_'>
         <parameter type-id='type-id-2278' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
@@ -16757,7 +16757,7 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_node&lt;AutoData&gt;*&amp;&gt;' mangled-name='_ZSt7forwardIRPSt13_Rb_tree_nodeI8AutoDataEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt13_Rb_tree_nodeI8AutoDataEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-3118' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2005'/>
+        <return type-id='type-id-2016'/>
       </function-decl>
       <function-decl name='forward&lt;TargetImage&gt;' mangled-name='_ZSt7forwardI11TargetImageEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardI11TargetImageEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-3091' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
@@ -16777,11 +16777,11 @@
       </function-decl>
       <function-decl name='forward&lt;std::tuple&lt;void const* const&amp;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJRKPKvEEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIJRKPKvEEEOT_RNSt16remove_referenceIS6_E4typeE'>
         <parameter type-id='type-id-3135' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2014'/>
+        <return type-id='type-id-2025'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_iterator&lt;AutoData&gt; &gt;' mangled-name='_ZSt7forwardISt17_Rb_tree_iteratorI8AutoDataEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt17_Rb_tree_iteratorI8AutoDataEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-3112' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2003'/>
+        <return type-id='type-id-2014'/>
       </function-decl>
       <function-decl name='forward&lt;AutoData&gt;' mangled-name='_ZSt7forwardI8AutoDataEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardI8AutoDataEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-3083' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
@@ -16793,15 +16793,15 @@
       </function-decl>
       <function-decl name='forward&lt;std::tuple&lt;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJEEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIIEEEOT_RNSt16remove_referenceIS2_E4typeE'>
         <parameter type-id='type-id-3129' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2012'/>
+        <return type-id='type-id-2023'/>
       </function-decl>
       <function-decl name='forward&lt;std::tuple&lt;long unsigned int const&amp;&gt; &gt;' mangled-name='_ZSt7forwardISt5tupleIJRKmEEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5tupleIIRKmEEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-3132' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2013'/>
+        <return type-id='type-id-2024'/>
       </function-decl>
       <function-decl name='forward&lt;const std::piecewise_construct_t&amp;&gt;' mangled-name='_ZSt7forwardIRKSt21piecewise_construct_tEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt21piecewise_construct_tEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-3106' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1989'/>
+        <return type-id='type-id-2000'/>
       </function-decl>
       <function-decl name='move&lt;TargetImage&amp;&gt;' mangled-name='_ZSt4moveIR11TargetImageEONSt16remove_referenceIT_E4typeEOS3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIR11TargetImageEONSt16remove_referenceIT_E4typeEOS3_'>
         <parameter type-id='type-id-1388' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
@@ -16809,7 +16809,7 @@
       </function-decl>
       <function-decl name='forward&lt;std::_Rb_tree_iterator&lt;AutoData&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRSt17_Rb_tree_iteratorI8AutoDataEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSt17_Rb_tree_iteratorI8AutoDataEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-3115' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2003'/>
+        <return type-id='type-id-2014'/>
       </function-decl>
       <function-decl name='move&lt;AutoData&amp;&gt;' mangled-name='_ZSt4moveIR8AutoDataEONSt16remove_referenceIT_E4typeEOS3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIR8AutoDataEONSt16remove_referenceIT_E4typeEOS3_'>
         <parameter type-id='type-id-1260' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
@@ -18461,7 +18461,7 @@
     </class-decl>
     <class-decl name='VarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='139' column='1' id='type-id-2452'>
       <member-type access='public'>
-        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2449'>
+        <class-decl name='Entry' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='150' column='1' id='type-id-2451'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='name' type-id='type-id-152' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='151' column='1'/>
           </data-member>
@@ -18495,7 +18495,7 @@
         <var-decl name='max_name_len' type-id='type-id-227' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='102' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='pthread_mutex_t' type-id='type-id-2061' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-2015'/>
+    <typedef-decl name='pthread_mutex_t' type-id='type-id-2061' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-1967'/>
     <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='91' column='1' id='type-id-2061'>
       <member-type access='private'>
         <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='92' column='1' id='type-id-2076'>
@@ -18544,17 +18544,17 @@
         <var-decl name='__next' type-id='type-id-2092' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='intptr_t' type-id='type-id-191' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-2448'/>
+    <typedef-decl name='intptr_t' type-id='type-id-191' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-2447'/>
     <typedef-decl name='uint64_t' type-id='type-id-6' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-56'/>
-    <class-decl name='VarList' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='169' column='1' id='type-id-2447'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2450'/>
+    <class-decl name='VarList' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='169' column='1' id='type-id-2446'>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2449'/>
       <member-type access='private'>
         <class-decl name='BufEntry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='185' column='1' id='type-id-2116'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='name' type-id='type-id-2448' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='186' column='1'/>
+            <var-decl name='name' type-id='type-id-2447' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='186' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='addr' type-id='type-id-2448' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='187' column='1'/>
+            <var-decl name='addr' type-id='type-id-2447' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='187' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
@@ -18614,77 +18614,77 @@
     <typedef-decl name='MyoArena' type-id='type-id-2' filepath='../../../gcc/liboffloadmic/include/myo/myotypes.h' line='140' column='1' id='type-id-3188'/>
     <class-decl name='mutex_t' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='82' column='1' id='type-id-192'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='m_lock' type-id='type-id-2015' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='119' column='1'/>
+        <var-decl name='m_lock' type-id='type-id-1967' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='119' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='unlock' mangled-name='_ZN7mutex_t6unlockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t6unlockEv'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='lock' mangled-name='_ZN7mutex_t4lockEv' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_t4lockEv'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' destructor='yes'>
         <function-decl name='~mutex_t' mangled-name='_ZN7mutex_tD2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tD1Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
       <member-function access='public' constructor='yes'>
         <function-decl name='mutex_t' mangled-name='_ZN7mutex_tC2Ev' filepath='../../../gcc/liboffloadmic/runtime/offload_util.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN7mutex_tC2Ev'>
-          <parameter type-id='type-id-2016' name='this' is-artificial='yes'/>
+          <parameter type-id='type-id-1968' name='this' is-artificial='yes'/>
           <return type-id='type-id-154'/>
         </function-decl>
       </member-function>
@@ -18932,14 +18932,14 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2450'>
+    <class-decl name='TableList&lt;VarTable&gt;' size-in-bits='384' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='41' column='1' id='type-id-2449'>
       <member-type access='private'>
-        <typedef-decl name='Table' type-id='type-id-2452' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-2451'/>
+        <typedef-decl name='Table' type-id='type-id-2452' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='44' column='1' id='type-id-2450'/>
       </member-type>
       <member-type access='private'>
         <class-decl name='Node' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='47' column='1' id='type-id-2445'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='table' type-id='type-id-2451' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='48' column='1'/>
+            <var-decl name='table' type-id='type-id-2450' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='48' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='prev' type-id='type-id-2099' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='49' column='1'/>
@@ -18997,10 +18997,10 @@
     <pointer-type-def type-id='type-id-3432' size-in-bits='64' id='type-id-3491'/>
     <qualified-type-def type-id='type-id-3491' const='yes' id='type-id-3475'/>
     <pointer-type-def type-id='type-id-3423' size-in-bits='64' id='type-id-3419'/>
-    <pointer-type-def type-id='type-id-2450' size-in-bits='64' id='type-id-3492'/>
+    <pointer-type-def type-id='type-id-2449' size-in-bits='64' id='type-id-3492'/>
     <qualified-type-def type-id='type-id-3492' const='yes' id='type-id-3482'/>
     <pointer-type-def type-id='type-id-2445' size-in-bits='64' id='type-id-2099'/>
-    <pointer-type-def type-id='type-id-2447' size-in-bits='64' id='type-id-3493'/>
+    <pointer-type-def type-id='type-id-2446' size-in-bits='64' id='type-id-3493'/>
     <qualified-type-def type-id='type-id-3493' const='yes' id='type-id-3494'/>
     <pointer-type-def type-id='type-id-2091' size-in-bits='64' id='type-id-2092'/>
     <qualified-type-def type-id='type-id-3471' const='yes' id='type-id-3495'/>
@@ -19011,19 +19011,19 @@
     <pointer-type-def type-id='type-id-3447' size-in-bits='64' id='type-id-3443'/>
     <qualified-type-def type-id='type-id-3444' const='yes' id='type-id-3448'/>
     <pointer-type-def type-id='type-id-3448' size-in-bits='64' id='type-id-3445'/>
-    <qualified-type-def type-id='type-id-2449' const='yes' id='type-id-2446'/>
-    <pointer-type-def type-id='type-id-2446' size-in-bits='64' id='type-id-2100'/>
+    <qualified-type-def type-id='type-id-2451' const='yes' id='type-id-2448'/>
+    <pointer-type-def type-id='type-id-2448' size-in-bits='64' id='type-id-2100'/>
     <qualified-type-def type-id='type-id-156' const='yes' id='type-id-155'/>
     <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-152'/>
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-198'/>
     <qualified-type-def type-id='type-id-3496' id='type-id-3497'/>
     <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-3496'/>
-    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-2049'/>
-    <qualified-type-def type-id='type-id-2049' const='yes' id='type-id-2016'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-2055'/>
+    <qualified-type-def type-id='type-id-2055' const='yes' id='type-id-1968'/>
     <pointer-type-def type-id='type-id-3439' size-in-bits='64' id='type-id-3434'/>
     <var-decl name='__offload_entries' type-id='type-id-3464' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='202' column='1'/>
     <var-decl name='__offload_funcs' type-id='type-id-3464' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='203' column='1'/>
-    <var-decl name='__offload_vars' type-id='type-id-2447' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='204' column='1'/>
+    <var-decl name='__offload_vars' type-id='type-id-2446' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='204' column='1'/>
     <var-decl name='__offload_myo_var_tables' type-id='type-id-3480' mangled-name='__offload_myo_var_tables' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='436' column='1' elf-symbol-id='__offload_myo_var_tables'/>
     <var-decl name='__offload_myo_vtable_tables' type-id='type-id-3480' mangled-name='__offload_myo_vtable_tables' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='437' column='1' elf-symbol-id='__offload_myo_vtable_tables'/>
     <var-decl name='__offload_myo_func_tables' type-id='type-id-3478' mangled-name='__offload_myo_func_tables' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='438' column='1' elf-symbol-id='__offload_myo_func_tables'/>
@@ -19141,10 +19141,6 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3516' size-in-bits='64' id='type-id-3514'/>
-    <type-decl name='double' size-in-bits='64' id='type-id-3513'/>
-    <qualified-type-def type-id='type-id-3512' id='type-id-3511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3515' size-in-bits='64' id='type-id-3512'/>
     <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-3508'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-25' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -19180,6 +19176,10 @@
         <var-decl name='tm_zone' type-id='type-id-152' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-3516' size-in-bits='64' id='type-id-3514'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-3513'/>
+    <qualified-type-def type-id='type-id-3512' id='type-id-3511'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3515' size-in-bits='64' id='type-id-3512'/>
     <namespace-decl name='std'>
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-3515'>
         <member-type access='private'>
@@ -19692,7 +19692,7 @@
     <pointer-type-def type-id='type-id-3575' size-in-bits='64' id='type-id-3577'/>
     <reference-type-def kind='lvalue' type-id='type-id-3578' size-in-bits='64' id='type-id-3579'/>
     <pointer-type-def type-id='type-id-3578' size-in-bits='64' id='type-id-3580'/>
-    <pointer-type-def type-id='type-id-2065' size-in-bits='64' id='type-id-3581'/>
+    <pointer-type-def type-id='type-id-2069' size-in-bits='64' id='type-id-3581'/>
     <qualified-type-def type-id='type-id-3581' const='yes' id='type-id-3582'/>
     <reference-type-def kind='lvalue' type-id='type-id-156' size-in-bits='64' id='type-id-2084'/>
     <qualified-type-def type-id='type-id-214' const='yes' id='type-id-2507'/>
@@ -19704,7 +19704,7 @@
     <pointer-type-def type-id='type-id-3585' size-in-bits='64' id='type-id-3586'/>
     <qualified-type-def type-id='type-id-3578' const='yes' id='type-id-3587'/>
     <pointer-type-def type-id='type-id-3587' size-in-bits='64' id='type-id-3588'/>
-    <qualified-type-def type-id='type-id-2065' const='yes' id='type-id-3589'/>
+    <qualified-type-def type-id='type-id-2069' const='yes' id='type-id-3589'/>
     <reference-type-def kind='lvalue' type-id='type-id-3589' size-in-bits='64' id='type-id-3590'/>
     <pointer-type-def type-id='type-id-3589' size-in-bits='64' id='type-id-3591'/>
     <qualified-type-def type-id='type-id-3570' const='yes' id='type-id-3592'/>
@@ -19822,7 +19822,7 @@
       </enum-decl>
       <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1231'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-2023'/>
+          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-1975'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
@@ -19830,7 +19830,7 @@
       </class-decl>
       <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='69' column='1' id='type-id-1233'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-2022'/>
+          <typedef-decl name='value_type' type-id='type-id-149' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='72' column='1' id='type-id-1974'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='value' type-id='type-id-264' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='71' column='1'/>
@@ -19839,7 +19839,7 @@
       <class-decl name='allocator_traits&lt;std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='81' column='1' id='type-id-3646'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1224'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2066' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3647'/>
+          <typedef-decl name='value_type' type-id='type-id-2070' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3647'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1226' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='93' column='1' id='type-id-3648'/>
@@ -19858,25 +19858,25 @@
         </member-type>
       </class-decl>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2063'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2065'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2069'/>
         <member-type access='private'>
           <class-decl name='rebind&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-2064'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-2021'/>
+              <typedef-decl name='other' type-id='type-id-2063' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-1973'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-2020'/>
+          <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='97' column='1' id='type-id-1972'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-2017'/>
+          <typedef-decl name='pointer' type-id='type-id-214' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='99' column='1' id='type-id-1969'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-2019'/>
+          <typedef-decl name='const_pointer' type-id='type-id-152' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='100' column='1' id='type-id-1971'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-156' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2066'/>
+          <typedef-decl name='value_type' type-id='type-id-156' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2070'/>
         </member-type>
       </class-decl>
       <class-decl name='__detector&lt;long unsigned int, void, std::__allocator_traits_base::__size_type, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3653'>
@@ -19886,16 +19886,16 @@
       </class-decl>
       <class-decl name='__allocator_traits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='43' column='1' id='type-id-1224'>
         <member-type access='protected'>
-          <typedef-decl name='__pointer' type-id='type-id-2017' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1175'/>
+          <typedef-decl name='__pointer' type-id='type-id-1969' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='50' column='1' id='type-id-1175'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='__c_pointer' type-id='type-id-2019' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-2018'/>
+          <typedef-decl name='__c_pointer' type-id='type-id-1971' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='52' column='1' id='type-id-1970'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='__size_type' type-id='type-id-2020' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1180'/>
+          <typedef-decl name='__size_type' type-id='type-id-1972' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='60' column='1' id='type-id-1180'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__rebind' type-id='type-id-2021' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1237'/>
+          <typedef-decl name='__rebind' type-id='type-id-1973' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='46' column='1' id='type-id-1237'/>
         </member-type>
       </class-decl>
       <class-decl name='__detector&lt;std::allocator&lt;char&gt;, void, std::__allocator_traits_base::__rebind, std::allocator&lt;char&gt;, char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3655'>
@@ -19912,7 +19912,7 @@
       </class-decl>
       <class-decl name='__detector&lt;char const*, void, std::__allocator_traits_base::__c_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2432' column='1' id='type-id-3657'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2018' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3658'/>
+          <typedef-decl name='type' type-id='type-id-1970' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2435' column='1' id='type-id-3658'/>
         </member-type>
       </class-decl>
       <class-decl name='__detector&lt;void const*, void, std::__allocator_traits_base::__cv_pointer, std::allocator&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2423' column='1' id='type-id-3659'>
@@ -20310,7 +20310,7 @@
           <var-decl name='__digits' type-id='type-id-198' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2065'>
+      <class-decl name='new_allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2069'>
         <member-type access='private'>
           <typedef-decl name='size_type' type-id='type-id-1137' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2080'/>
         </member-type>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 4f5bddd1..68df65c5 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1230,6 +1230,14 @@
       <parameter type-id='type-id-9' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='63' column='1'/>
       <return type-id='type-id-90'/>
     </function-decl>
+    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-146'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='ot' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='fallback' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='54' column='1'/>
+      </data-member>
+    </class-decl>
     <array-type-def dimensions='1' type-id='type-id-43' size-in-bits='8' id='type-id-127'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
@@ -1288,14 +1296,6 @@
     </function-type>
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-144'/>
     <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-145'/>
-    <class-decl name='hb_shaper_data_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='53' column='1' id='type-id-146'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ot' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='fallback' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='54' column='1'/>
-      </data-member>
-    </class-decl>
     <typedef-decl name='hb_face_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-172'/>
     <typedef-decl name='hb_font_funcs_t' type-id='type-id-175' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-173'/>
     <class-decl name='hb_face_t' size-in-bits='1472' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='43' column='1' id='type-id-174'>
@@ -4558,129 +4558,13 @@
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-140'/>
     </function-type>
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-675'/>
-    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-676'/>
-    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-677'/>
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-678'/>
-    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-679'/>
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-680'/>
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-681'/>
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-618' const='yes' id='type-id-683'/>
-    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-684'/>
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-685'/>
-    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-686'/>
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-687'/>
-    <qualified-type-def type-id='type-id-619' const='yes' id='type-id-688'/>
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-689'/>
-    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-690'/>
-    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-691'/>
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-692'/>
-    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-693'/>
-    <qualified-type-def type-id='type-id-808' const='yes' id='type-id-694'/>
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-695'/>
-    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-696'/>
-    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-697'/>
-    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-698'/>
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-699'/>
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-700'/>
-    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-701'/>
-    <qualified-type-def type-id='type-id-814' const='yes' id='type-id-702'/>
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-703'/>
-    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-704'/>
-    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-705'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-706'/>
-    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-707'/>
-    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-708'/>
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-709'/>
-    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-710'/>
-    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-711'/>
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-712'/>
-    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-713'/>
-    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-714'/>
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-715'/>
-    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-716'/>
-    <qualified-type-def type-id='type-id-829' const='yes' id='type-id-717'/>
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-718'/>
-    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-719'/>
-    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-720'/>
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-721'/>
-    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-722'/>
-    <qualified-type-def type-id='type-id-835' const='yes' id='type-id-723'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-724'/>
-    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-725'/>
-    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-726'/>
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-727'/>
-    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-728'/>
-    <qualified-type-def type-id='type-id-841' const='yes' id='type-id-729'/>
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-730'/>
-    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-731'/>
-    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-732'/>
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-733'/>
-    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-734'/>
-    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-735'/>
-    <qualified-type-def type-id='type-id-629' const='yes' id='type-id-736'/>
-    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-737'/>
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-738'/>
-    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-739'/>
-    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-740'/>
-    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-741'/>
-    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-742'/>
-    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-743'/>
-    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-744'/>
-    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-745'/>
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-746'/>
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-747'/>
-    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-748'/>
-    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-749'/>
-    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-750'/>
-    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-751'/>
-    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-752'/>
-    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-753'/>
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-754'/>
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-755'/>
-    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-756'/>
-    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-757'/>
-    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-758'/>
-    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-759'/>
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-760'/>
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-761'/>
-    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-762'/>
-    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-763'/>
-    <qualified-type-def type-id='type-id-653' const='yes' id='type-id-764'/>
-    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-765'/>
-    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-766'/>
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-767'/>
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-768'/>
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-769'/>
-    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-770'/>
-    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-771'/>
-    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-772'/>
-    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-773'/>
-    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-774'/>
-    <qualified-type-def type-id='type-id-664' const='yes' id='type-id-775'/>
-    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-776'/>
-    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-777'/>
-    <qualified-type-def type-id='type-id-667' const='yes' id='type-id-778'/>
-    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-779'/>
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-780'/>
-    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-781'/>
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-782'/>
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-783'/>
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-784'/>
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-785'/>
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-786'/>
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-787'/>
-    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-788'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-789'/>
-    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-790'/>
     <namespace-decl name='OT'>
       <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-618'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -4693,7 +4577,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -4706,7 +4590,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -4719,7 +4603,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-794' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -4729,14 +4613,14 @@
     <namespace-decl name='OT'>
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-622'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-866'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-795'>
             <member-type access='private'>
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-867'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-796'>
                 <data-member access='private'>
-                  <var-decl name='format1' type-id='type-id-868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='private'>
-                  <var-decl name='format2' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -4744,18 +4628,18 @@
               <var-decl name='format' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='912' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='u' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-796' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-870' is-artificial='yes'/>
+                <parameter type-id='type-id-799' is-artificial='yes'/>
                 <return type-id='type-id-13'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-871'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-800'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
@@ -4768,15 +4652,15 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='926' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-872' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-801' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
@@ -4785,9 +4669,9 @@
     <namespace-decl name='OT'>
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-623'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-868'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-797'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-803' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='681' column='1'/>
@@ -4805,15 +4689,15 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-874' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-874' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
@@ -4822,9 +4706,9 @@
     <namespace-decl name='OT'>
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-624'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-869'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-798'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-805' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='792' column='1'/>
@@ -4848,15 +4732,15 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-876' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-876' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
@@ -4868,7 +4752,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='975' column='1'/>
@@ -4878,7 +4762,7 @@
     <namespace-decl name='OT'>
       <class-decl name='Ligature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-626'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='component' type-id='type-id-625' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
@@ -4891,7 +4775,7 @@
     <namespace-decl name='OT'>
       <class-decl name='LigatureSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-627'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligature' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-807' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='777' column='1'/>
@@ -4907,7 +4791,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ligatureSet' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-808' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='865' column='1'/>
@@ -4926,7 +4810,7 @@
           <var-decl name='subTable' type-id='type-id-619' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='markFilteringSetX' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='618' column='1'/>
@@ -4935,7 +4819,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-630'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -4946,7 +4830,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -4957,7 +4841,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-632'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -4968,7 +4852,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-633'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -4979,7 +4863,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -4990,7 +4874,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-635'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5001,7 +4885,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-636'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5012,7 +4896,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-637'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5034,7 +4918,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-639'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5056,7 +4940,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-641'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5067,7 +4951,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-642'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5079,7 +4963,7 @@
             <parameter type-id='type-id-515' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-882'/>
+            <parameter type-id='type-id-811'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -5087,7 +4971,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-643'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5107,7 +4991,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-644'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5119,7 +5003,7 @@
             <parameter type-id='type-id-480' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-883'/>
+            <parameter type-id='type-id-812'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -5127,7 +5011,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-645'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5138,7 +5022,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-646'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5149,7 +5033,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-647'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5160,7 +5044,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-648'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5171,7 +5055,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-649'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5182,7 +5066,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-650'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5193,7 +5077,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-651'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5204,7 +5088,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-652'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5224,7 +5108,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-653'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5235,7 +5119,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-654'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5246,7 +5130,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5257,7 +5141,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5269,7 +5153,7 @@
             <parameter type-id='type-id-509' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -5277,7 +5161,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5288,7 +5172,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5308,7 +5192,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-659'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5319,7 +5203,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-660'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5330,7 +5214,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-661'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5341,7 +5225,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-662'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5352,7 +5236,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-663'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5364,7 +5248,7 @@
             <parameter type-id='type-id-514' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-885'/>
+            <parameter type-id='type-id-814'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -5372,7 +5256,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-664'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5405,7 +5289,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-667'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5416,7 +5300,7 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-668'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -5474,8 +5358,8 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-618'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-886' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-815' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
@@ -5483,11 +5367,11 @@
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-672'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-820'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-888' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-818' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
@@ -5498,37 +5382,37 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-629'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -5536,7 +5420,7 @@
     <namespace-decl name='OT'>
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-674'>
         <member-type access='public'>
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-898'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-828'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -5549,148 +5433,251 @@
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-899'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-829'>
             <member-type access='private'>
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-900'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='sub_format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='private'>
-              <var-decl name='header' type-id='type-id-900' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='single' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='multiple' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='alternate' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='ligature' type-id='type-id-904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='context' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='chainContext' type-id='type-id-906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='extension' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='reverseChainContextSingle' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1149' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-909' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-839' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-862'>
+    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-675'/>
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-676'/>
+    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-677'/>
+    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-678'/>
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-679'/>
+    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-680'/>
+    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-681'/>
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-618' const='yes' id='type-id-683'/>
+    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-684'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-685'/>
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-687'/>
+    <qualified-type-def type-id='type-id-619' const='yes' id='type-id-688'/>
+    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-689'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-692'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-693'/>
+    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-697'/>
+    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-698'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-699'/>
+    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-700'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-701'/>
+    <qualified-type-def type-id='type-id-865' const='yes' id='type-id-702'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-703'/>
+    <qualified-type-def type-id='type-id-867' const='yes' id='type-id-704'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-705'/>
+    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-706'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-707'/>
+    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-708'/>
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-709'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-710'/>
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-711'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-712'/>
+    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-713'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-714'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-715'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-716'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-717'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-718'/>
+    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-719'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-720'/>
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-721'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-722'/>
+    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-723'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-724'/>
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-725'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-726'/>
+    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-727'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-728'/>
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-729'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-730'/>
+    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-731'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-732'/>
+    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-733'/>
+    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-629' const='yes' id='type-id-736'/>
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-737'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-738'/>
+    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-739'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-741'/>
+    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-742'/>
+    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-743'/>
+    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-744'/>
+    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-745'/>
+    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-746'/>
+    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-747'/>
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-748'/>
+    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-749'/>
+    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-750'/>
+    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-751'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-752'/>
+    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-753'/>
+    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-754'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-756'/>
+    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-757'/>
+    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-758'/>
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-759'/>
+    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-760'/>
+    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-761'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-762'/>
+    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-653' const='yes' id='type-id-764'/>
+    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-765'/>
+    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-766'/>
+    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-767'/>
+    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-768'/>
+    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-769'/>
+    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-770'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-771'/>
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-772'/>
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-774'/>
+    <qualified-type-def type-id='type-id-664' const='yes' id='type-id-775'/>
+    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-776'/>
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-777'/>
+    <qualified-type-def type-id='type-id-667' const='yes' id='type-id-778'/>
+    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-779'/>
+    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-780'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-781'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-783'/>
+    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-784'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-786'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-787'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-789'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-799'/>
+    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-791'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-870'/>
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-884'/>
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-896'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-894'/>
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-892'/>
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-910'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-890'/>
-    <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-863'>
+    <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='16' id='type-id-792'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-864'>
+    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-793'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-865'>
+    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-794'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-880'>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-813'/>
+    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-809'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-872'/>
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-874'/>
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-876'/>
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-882'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-883'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-885'/>
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-886'/>
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-888'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-889'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-909'/>
-    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-887'/>
-    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-873'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-875'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-826'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-840'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-820'/>
     <namespace-decl name='OT'>
-      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-903'>
+      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-833'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-930'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-918'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-791'>
+      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-842'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
         </data-member>
@@ -5709,7 +5696,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-792'>
+      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-843'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
         </data-member>
@@ -5731,7 +5718,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-793'>
+      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-844'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
         </data-member>
@@ -5756,12 +5743,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-794'>
+      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-845'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rows' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='matrixZ' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='369' column='1'/>
@@ -5769,12 +5756,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-795'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-846'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-922' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5782,12 +5769,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-796'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-847'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5795,19 +5782,19 @@
         <member-function access='public'>
           <function-decl name='lsearch&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-458' is-artificial='yes'/>
-            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-924'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-797'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-848'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5815,12 +5802,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-798'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-849'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5828,12 +5815,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-799'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-850'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5841,12 +5828,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-800'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-851'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5854,12 +5841,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-801'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-852'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5867,12 +5854,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-802'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-853'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5880,19 +5867,19 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-803'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-854'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-943' is-artificial='yes'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -5902,12 +5889,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-804'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-855'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5915,12 +5902,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-805'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5928,12 +5915,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-806'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-857'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5941,12 +5928,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-807'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-858'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5954,12 +5941,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-808'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-859'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5967,12 +5954,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-809'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-860'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5980,12 +5967,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-810'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-861'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -5993,12 +5980,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-811'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-862'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6006,34 +5993,34 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-812'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-863'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-813'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-864'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6041,19 +6028,19 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-814'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-865'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-943' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-956' is-artificial='yes'/>
+            <parameter type-id='type-id-944' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -6063,12 +6050,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-815'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-866'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6076,12 +6063,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-816'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-867'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6089,12 +6076,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-868'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6102,12 +6089,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-818'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-869'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6115,19 +6102,19 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-819'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-870'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-962' is-artificial='yes'/>
+            <parameter type-id='type-id-950' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -6137,12 +6124,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-820'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6150,12 +6137,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-821'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-871'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6163,12 +6150,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-822'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-872'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-953' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6176,12 +6163,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-823'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-873'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6189,12 +6176,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-824'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-874'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6202,12 +6189,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-825'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-875'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6215,12 +6202,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-826'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-876'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -6228,7 +6215,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-827'>
+      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-877'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
         </data-member>
@@ -6244,7 +6231,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-828'>
+      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-878'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
         </data-member>
@@ -6260,7 +6247,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-829'>
+      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-879'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
         </data-member>
@@ -6279,17 +6266,17 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-906'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-836'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-830'>
+      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-880'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='classFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='startGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <var-decl name='classValue' type-id='type-id-618' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
@@ -6300,7 +6287,7 @@
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='952' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-531' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
@@ -6308,7 +6295,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-831'>
+      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-881'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
         </data-member>
@@ -6319,7 +6306,7 @@
           <var-decl name='languageZ' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='glyphIdArray' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
@@ -6330,7 +6317,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-832'>
+      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-882'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
         </data-member>
@@ -6338,7 +6325,7 @@
           <var-decl name='lengthZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='record' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='389' column='1'/>
@@ -6346,7 +6333,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-833'>
+      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-883'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
         </data-member>
@@ -6369,7 +6356,7 @@
           <var-decl name='rangeShiftZ' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='values' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='171' column='1'/>
@@ -6377,7 +6364,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-834'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-884'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
@@ -6391,7 +6378,7 @@
           <var-decl name='languageZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
@@ -6399,7 +6386,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-835'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-885'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
@@ -6413,7 +6400,7 @@
           <var-decl name='languageZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
@@ -6421,7 +6408,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-836'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-886'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='formatReserved' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
@@ -6443,7 +6430,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-837'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-887'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='formatReserved' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
@@ -6457,7 +6444,7 @@
           <var-decl name='startCharCode' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='glyphIdArray' type-id='type-id-799' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
@@ -6465,7 +6452,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-838'>
+      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-888'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
         </data-member>
@@ -6476,10 +6463,10 @@
           <var-decl name='lookupCount' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='coverageZ' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1520' column='1'/>
@@ -6487,12 +6474,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-905'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-835'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-839'>
+      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-889'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='startSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
         </data-member>
@@ -6503,7 +6490,7 @@
           <var-decl name='deltaFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='deltaValue' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1166' column='1'/>
@@ -6511,7 +6498,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-840'>
+      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-890'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='platformID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
         </data-member>
@@ -6530,7 +6517,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-841'>
+      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-891'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
         </data-member>
@@ -6549,17 +6536,17 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-907'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-837'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-842'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-892'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='featureParams' type-id='type-id-643' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lookupIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='538' column='1'/>
@@ -6567,7 +6554,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-843'>
+      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-893'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
         </data-member>
@@ -6587,7 +6574,7 @@
           <var-decl name='firstParamUILabelNameID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='characters' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='442' column='1'/>
@@ -6595,7 +6582,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-844'>
+      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-894'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='designSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
         </data-member>
@@ -6620,7 +6607,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-845'>
+      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
         </data-member>
@@ -6636,15 +6623,15 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-846'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-896'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lookupOrderZ' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-810' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <var-decl name='reqFeatureIndex' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='featureIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='214' column='1'/>
@@ -6652,9 +6639,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-904'>
+      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-834'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-977'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-965'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
@@ -6664,47 +6651,47 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-847'>
+      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-897'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
         </data-member>
@@ -6732,7 +6719,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-848'>
+      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-898'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
         </data-member>
@@ -6760,7 +6747,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-849'>
+      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-899'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
         </data-member>
@@ -6788,7 +6775,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-850'>
+      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-900'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='klass' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
         </data-member>
@@ -6804,59 +6791,59 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-902'>
+      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-832'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-979'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-967'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-881'>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-810'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
@@ -6867,17 +6854,17 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-878'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-807'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-620'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-879'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-808'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-621'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-851'>
+      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-901'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
         </data-member>
@@ -6885,13 +6872,13 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='pairSet' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='714' column='1'/>
@@ -6899,7 +6886,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-852'>
+      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-902'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
         </data-member>
@@ -6907,10 +6894,10 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <var-decl name='classDef1' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
@@ -6925,7 +6912,7 @@
           <var-decl name='class2Count' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='817' column='1'/>
@@ -6933,14 +6920,14 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-853'>
+      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-903'>
         <member-type access='public'>
           <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-912'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='base' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='628' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='valueFormats' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='len1' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='630' column='1'/>
@@ -6954,7 +6941,7 @@
           <var-decl name='len' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='arrayZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='650' column='1'/>
@@ -6962,9 +6949,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-854'>
+      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-904'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-986'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-974'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -6981,9 +6968,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-855'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-905'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-987'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-975'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -7000,9 +6987,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-856'>
+      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-988'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-976'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -7019,59 +7006,59 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-908'>
+      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-838'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-989'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-977'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-857'>
+      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-907'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
         </data-member>
@@ -7079,10 +7066,10 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='476' column='1'/>
@@ -7090,7 +7077,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-858'>
+      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-908'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
         </data-member>
@@ -7098,13 +7085,13 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <var-decl name='valueCount' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='525' column='1'/>
@@ -7112,9 +7099,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-901'>
+      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-831'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-992'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-980'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
@@ -7127,49 +7114,49 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-859'>
+      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-909'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='varSelector' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='defaultUVS' type-id='type-id-666' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
@@ -7186,7 +7173,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-860'>
+      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-910'>
         <data-member access='public' static='yes'>
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
         </data-member>
@@ -7200,25 +7187,25 @@
           <var-decl name='version' type-id='type-id-273' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='ascender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
-          <var-decl name='descender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='lineGap' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
-          <var-decl name='advanceMax' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='minLeadingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
-          <var-decl name='minTrailingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='maxExtent' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
           <var-decl name='caretSlopeRise' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
@@ -7256,7 +7243,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-861'>
+      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-911'>
         <data-member access='public' static='yes'>
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
         </data-member>
@@ -7264,174 +7251,170 @@
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='encodingRecord' type-id='type-id-997' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='510' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-801'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-803'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-805'/>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-811'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-812'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-814'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-815'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-818'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-839'/>
+    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-816'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-802'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-804'/>
     <namespace-decl name='OT'>
-      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-877'/>
+      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-806'/>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-931'/>
+    <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-941'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-944'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-950'/>
+    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-959'>
       <subrange length='256' type-id='type-id-4' id='type-id-1001'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-934'>
+    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-922'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='64' id='type-id-935'>
+    <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='64' id='type-id-923'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
+    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-925'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-938'>
+    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-926'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-939'>
+    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-927'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-940'>
+    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-928'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-850' size-in-bits='32' id='type-id-941'>
+    <array-type-def dimensions='1' type-id='type-id-900' size-in-bits='32' id='type-id-929'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-943'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-953'/>
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-956'/>
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-962'/>
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-985'/>
-    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-933'>
+    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-921'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-942'>
+    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-930'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-944'>
+    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-932'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-945'>
+    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-933'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-946'>
+    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-934'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-947'>
+    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-935'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-948'>
+    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-936'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-949'>
+    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-937'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-950'>
+    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-938'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-951'>
+    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-939'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-952'>
+    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-940'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-954'>
+    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-942'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-955'>
+    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-943'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-957'>
+    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-945'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-958'>
+    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-946'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-959'>
+    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-947'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-960'>
+    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-948'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-961'>
+    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-949'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-963'>
+    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-951'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-854' size-in-bits='48' id='type-id-964'>
+    <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='48' id='type-id-952'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='48' id='type-id-965'>
+    <array-type-def dimensions='1' type-id='type-id-905' size-in-bits='48' id='type-id-953'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-856' size-in-bits='48' id='type-id-966'>
+    <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='48' id='type-id-954'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-967'>
+    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-955'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-968'>
+    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-956'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='88' id='type-id-969'>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-973'/>
+    <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='88' id='type-id-957'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-932'/>
-    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-918'/>
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-999'/>
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-919'/>
-    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-920'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-936'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-978'/>
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-981'/>
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-921'/>
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-923'/>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-991'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-993'/>
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-924'/>
-    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-925'/>
-    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-926'/>
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-927'/>
     <namespace-decl name='OT'>
-      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-931'>
+      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-919'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
         </data-member>
@@ -7439,7 +7422,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='alternateSet' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='552' column='1'/>
@@ -7447,158 +7430,158 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-970'>
+      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-958'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1016'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1011'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-1019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1011' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-974'>
+      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-962'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1021'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1016'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-975'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-963'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1025'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1020'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1025' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <return type-id='type-id-1027'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-976'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-798'/>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-964'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-980'>
+      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-968'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
         </data-member>
@@ -7606,7 +7589,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='sequence' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='401' column='1'/>
@@ -7614,12 +7597,12 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-983'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-971'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-863'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-990'>
+      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-978'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
         </data-member>
@@ -7627,10 +7610,10 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <var-decl name='substituteX' type-id='type-id-618' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
@@ -7641,39 +7624,39 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-973'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-961'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-997'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-796'/>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-985'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-847'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-972'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-826'/>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-960'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-876'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1031' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-982'>
+      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-970'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <member-type access='public'>
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1032'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1027'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -7693,9 +7676,9 @@
     <namespace-decl name='OT'>
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1033'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1028'>
             <member-type access='public'>
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1034'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1029'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -7703,7 +7686,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1035'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1030'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -7711,7 +7694,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1036'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <var-decl name='lookup_props' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='384' column='1'/>
@@ -7729,40 +7712,40 @@
               <var-decl name='syllable' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='388' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='match_func' type-id='type-id-1036' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1031' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <var-decl name='match_data' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='390' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-1033' is-artificial='yes'/>
                 <return type-id='type-id-13'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1039'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1034'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='530' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1041' is-artificial='yes'/>
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-1036' is-artificial='yes'/>
+                <parameter type-id='type-id-826'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -7772,18 +7755,18 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1042'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1037'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='460' column='1'/>
@@ -7793,8 +7776,8 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1043' is-artificial='yes'/>
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-826'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -7804,10 +7787,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1044'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1040' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1039'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='264' column='1'/>
@@ -7834,7 +7817,7 @@
           <var-decl name='auto_zwj' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='288' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recurse_func' type-id='type-id-1044' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1039' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='290' column='1'/>
@@ -7843,7 +7826,7 @@
           <var-decl name='lookup_props' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='291' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='gdef' type-id='type-id-1046' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1041' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='has_glyph_classes' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='293' column='1'/>
@@ -7853,7 +7836,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-143'/>
             <parameter type-id='type-id-161'/>
@@ -7862,142 +7845,142 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8005,10 +7988,10 @@
     <namespace-decl name='OT'>
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1068' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1067'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1062'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='58' column='1'/>
@@ -8017,10 +8000,10 @@
           <var-decl name='face' type-id='type-id-144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='glyphs' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='recurse_func' type-id='type-id-1067' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1062' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='79' column='1'/>
@@ -8030,95 +8013,95 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8126,10 +8109,10 @@
     <namespace-decl name='OT'>
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1070' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1069'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1065' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1064'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='146' column='1'/>
@@ -8138,22 +8121,22 @@
           <var-decl name='face' type-id='type-id-144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='before' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='input' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='after' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='output' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='recurse_func' type-id='type-id-1069' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1064' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recursed_lookups' type-id='type-id-1071' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1066' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='200' column='1'/>
@@ -8163,161 +8146,161 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8325,7 +8308,7 @@
     <namespace-decl name='OT'>
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='238' column='1'/>
@@ -8335,148 +8318,148 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8484,7 +8467,7 @@
     <namespace-decl name='OT'>
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
@@ -8506,7 +8489,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
             <parameter type-id='type-id-152'/>
             <parameter type-id='type-id-12'/>
@@ -8516,93 +8499,93 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-929'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-997'>
       <member-type access='public'>
-        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1072'/>
+        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1067'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-15' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='148' column='1'/>
@@ -8629,69 +8612,49 @@
         <var-decl name='INVALID' type-id='type-id-151' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='elts' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-1068' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-999'/>
+    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-987'/>
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-988'/>
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-989'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-990'/>
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-981'/>
+    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-992'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-993'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-994'/>
+    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-995'/>
     <namespace-decl name='OT'>
-      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-995'/>
+      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-983'/>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-996'/>
+      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-984'/>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-994'/>
+      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-982'/>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-984'/>
+      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-972'/>
     </namespace-decl>
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-928'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-996'/>
     <typedef-decl name='hb_void_t' type-id='type-id-1076' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-998'/>
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
     <array-type-def dimensions='1' type-id='type-id-1077' size-in-bits='16' id='type-id-1074'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1037'/>
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-1010'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1050'/>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1020'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1056'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1024'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1053'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-1054'/>
-    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1055'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1059'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1026'/>
-    <qualified-type-def type-id='type-id-1089' id='type-id-1046'/>
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1011'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-1052'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1060'/>
-    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1061'/>
-    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1062'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1049'/>
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1065'/>
-    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1066'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1013'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1051'/>
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1063'/>
-    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1064'/>
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-1014'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1094' size-in-bits='64' id='type-id-1048'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1030'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1031'/>
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1027'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1040'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1076'/>
-    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
-      <subrange length='2048' type-id='type-id-4' id='type-id-1099'/>
-    </array-type-def>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1033'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1032'/>
     <namespace-decl name='OT'>
-      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1017'>
+      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1012'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
         </data-member>
@@ -8699,7 +8662,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1891' column='1'/>
@@ -8707,7 +8670,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1018'>
+      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1013'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
         </data-member>
@@ -8724,7 +8687,7 @@
           <var-decl name='lookaheadClassDef' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2015' column='1'/>
@@ -8732,21 +8695,21 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1019'>
+      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1014'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='inputX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2138' column='1'/>
@@ -8773,7 +8736,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1022'>
+      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1017'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
         </data-member>
@@ -8781,7 +8744,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1331' column='1'/>
@@ -8789,7 +8752,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1023'>
+      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1018'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
         </data-member>
@@ -8800,7 +8763,7 @@
           <var-decl name='classDef' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1426' column='1'/>
@@ -8834,7 +8797,7 @@
     <namespace-decl name='OT'>
       <class-decl name='IntType&lt;unsigned int, 3u&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-1081' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -8861,27 +8824,27 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1015'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-804'/>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1010'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-855'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1029'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-808'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1024'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-859'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1028'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1023'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-868'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
       <class-decl name='RangeRecord' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='start' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='end' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <var-decl name='value' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
@@ -8894,15 +8857,15 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
@@ -8911,10 +8874,10 @@
     <namespace-decl name='OT'>
       <class-decl name='UVSMapping' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-1008'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='unicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
-          <var-decl name='glyphID' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
@@ -8927,7 +8890,7 @@
     <namespace-decl name='OT'>
       <class-decl name='UnicodeValueRange' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='startUnicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='additionalCount' type-id='type-id-1000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
@@ -8942,66 +8905,82 @@
     </namespace-decl>
     <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1075'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1083' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-1105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1084' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1069'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1015'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1088' size-in-bits='64' id='type-id-1052'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1050'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1054'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1021'/>
+    <qualified-type-def type-id='type-id-1095' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-1070'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1056'/>
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1057'/>
+    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-1071'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-1044'/>
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1060'/>
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1061'/>
+    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1046'/>
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1058'/>
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1059'/>
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-1073'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1042'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1025'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1026'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1035'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-1076'/>
+    <array-type-def dimensions='1' type-id='type-id-1067' size-in-bits='65536' id='type-id-1068'>
+      <subrange length='2048' type-id='type-id-4' id='type-id-1105'/>
+    </array-type-def>
     <namespace-decl name='OT'>
       <typedef-decl name='BYTE' type-id='type-id-84' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-1000'/>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1045'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1070'/>
-    <typedef-decl name='hb_set_t' type-id='type-id-929' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1071'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1079'/>
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1080'/>
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1081'/>
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1082'/>
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1083'/>
-    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1084'/>
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1085'/>
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1086'/>
-    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1087'/>
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1088'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1089'/>
-    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1090'/>
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1103'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1092'/>
-    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1093'/>
-    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1094'/>
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1096'/>
-    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1097'/>
-    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1065'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-997' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1066'/>
     <namespace-decl name='OT'>
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1102'>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1081'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-1113' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1100'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1079'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-858'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='OT'>
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1101'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-816'/>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1080'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
       </class-decl>
     </namespace-decl>
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1105'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1084'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1110' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-1115' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1111' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1104'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1083'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -9015,13 +8994,32 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1085'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1087'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1088'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1090'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1091'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1093'/>
+    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-1094'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1113' size-in-bits='64' id='type-id-1095'/>
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1099'/>
+    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1100'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-1101'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1102'/>
+    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1104'/>
     <namespace-decl name='OT'>
       <typedef-decl name='Value' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-1077'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1110'/>
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1111'/>
     <namespace-decl name='OT'>
-      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1109'>
+      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1112'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
         </data-member>
@@ -9029,15 +9027,15 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='entryExitRecord' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='984' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1112'/>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1114'>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1115'/>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1110'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -9051,7 +9049,7 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1115'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1111'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -9065,7 +9063,9 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1113'>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1114'/>
+    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1109'>
       <subrange length='3' type-id='type-id-4' id='type-id-1117'/>
     </array-type-def>
     <namespace-decl name='OT'>
@@ -9978,6 +9978,12 @@
       <parameter type-id='type-id-1146' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
       <return type-id='type-id-144'/>
     </function-decl>
+    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1204'/>
+    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1205'/>
+    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'/>
+    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1207'/>
+    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'/>
+    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
     <function-type size-in-bits='64' id='type-id-1210'>
       <parameter type-id='type-id-1137'/>
       <parameter type-id='type-id-4'/>
@@ -10006,12 +10012,6 @@
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-33'/>
     </function-type>
-    <class-decl name='FT_DriverRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1204'/>
-    <class-decl name='FT_Face_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1205'/>
-    <class-decl name='FT_LibraryRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1206'/>
-    <class-decl name='FT_Size_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1207'/>
-    <class-decl name='FT_Slot_InternalRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1208'/>
-    <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1209'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <enum-decl name='GUnicodeScript' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/glib@2.42.1-46d6a76b/include/glib-2.0/glib/gunicode.h' line='409' column='1' id='type-id-1215'>
@@ -10157,16 +10157,16 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-971'>
+    <array-type-def dimensions='1' type-id='type-id-1000' size-in-bits='2048' id='type-id-959'>
       <subrange length='256' type-id='type-id-4' id='type-id-1001'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-934'>
+    <array-type-def dimensions='1' type-id='type-id-1002' size-in-bits='96' id='type-id-922'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-840' size-in-bits='64' id='type-id-935'>
+    <array-type-def dimensions='1' type-id='type-id-890' size-in-bits='64' id='type-id-923'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-862'>
+    <array-type-def dimensions='1' type-id='type-id-280' size-in-bits='16' id='type-id-791'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1216' size-in-bits='32' id='type-id-1217'>
@@ -10175,19 +10175,19 @@
     <array-type-def dimensions='1' type-id='type-id-452' size-in-bits='16' id='type-id-1218'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-880'>
+    <array-type-def dimensions='1' type-id='type-id-415' size-in-bits='16' id='type-id-809'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-967'>
+    <array-type-def dimensions='1' type-id='type-id-1008' size-in-bits='40' id='type-id-955'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-968'>
+    <array-type-def dimensions='1' type-id='type-id-1009' size-in-bits='32' id='type-id-956'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-859' size-in-bits='88' id='type-id-969'>
+    <array-type-def dimensions='1' type-id='type-id-909' size-in-bits='88' id='type-id-957'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1113'>
+    <array-type-def dimensions='1' type-id='type-id-84' size-in-bits='24' id='type-id-1109'>
       <subrange length='3' type-id='type-id-4' id='type-id-1117'/>
     </array-type-def>
     <class-decl name='hb_ot_face_cmap_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='95' column='1' id='type-id-1219'>
@@ -10218,43 +10218,43 @@
         <var-decl name='blob' type-id='type-id-56' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='44' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-1223'/>
+    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1223'/>
     <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1224'/>
-    <pointer-type-def type-id='type-id-796' size-in-bits='64' id='type-id-1225'/>
+    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-1225'/>
     <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1226'/>
     <pointer-type-def type-id='type-id-618' size-in-bits='64' id='type-id-437'/>
     <qualified-type-def type-id='type-id-437' const='yes' id='type-id-1227'/>
-    <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-1228'/>
+    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-1228'/>
     <qualified-type-def type-id='type-id-1228' const='yes' id='type-id-1229'/>
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-1230'/>
+    <pointer-type-def type-id='type-id-874' size-in-bits='64' id='type-id-1230'/>
     <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1231'/>
-    <pointer-type-def type-id='type-id-825' size-in-bits='64' id='type-id-1232'/>
+    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-1232'/>
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
-    <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-1234'/>
+    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-1234'/>
     <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1235'/>
     <qualified-type-def type-id='type-id-267' const='yes' id='type-id-1236'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1237'/>
     <reference-type-def kind='lvalue' type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
     <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-1240'/>
     <qualified-type-def type-id='type-id-1240' const='yes' id='type-id-1241'/>
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-1242'/>
     <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1243'/>
-    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-1244'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-1244'/>
     <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1245'/>
-    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1246'/>
+    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-1246'/>
     <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1247'/>
     <reference-type-def kind='lvalue' type-id='type-id-1002' size-in-bits='64' id='type-id-1248'/>
     <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1249'/>
-    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-1250'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-1250'/>
     <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
-    <pointer-type-def type-id='type-id-835' size-in-bits='64' id='type-id-1252'/>
+    <pointer-type-def type-id='type-id-885' size-in-bits='64' id='type-id-1252'/>
     <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1253'/>
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1254'/>
+    <pointer-type-def type-id='type-id-886' size-in-bits='64' id='type-id-1254'/>
     <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1255'/>
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1256'/>
+    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-1256'/>
     <qualified-type-def type-id='type-id-1256' const='yes' id='type-id-1257'/>
-    <reference-type-def kind='lvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1258'/>
-    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-1259'/>
+    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1258'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1259'/>
     <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1260'/>
     <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-1261'/>
     <qualified-type-def type-id='type-id-281' const='yes' id='type-id-1262'/>
@@ -10278,36 +10278,36 @@
     <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1284'/>
     <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1285'/>
     <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1286'/>
-    <reference-type-def kind='lvalue' type-id='type-id-859' size-in-bits='64' id='type-id-1287'/>
-    <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-1288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-909' size-in-bits='64' id='type-id-1287'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-1288'/>
     <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1289'/>
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1290'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1290'/>
     <qualified-type-def type-id='type-id-1290' const='yes' id='type-id-1291'/>
     <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
     <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1294'/>
-    <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-1295'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-1295'/>
     <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1296'/>
-    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-679'/>
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-679'/>
     <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-466'/>
     <qualified-type-def type-id='type-id-466' const='yes' id='type-id-1297'/>
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-680'/>
+    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-680'/>
     <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-458'/>
     <qualified-type-def type-id='type-id-458' const='yes' id='type-id-1298'/>
     <qualified-type-def type-id='type-id-618' const='yes' id='type-id-683'/>
     <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-462'/>
     <qualified-type-def type-id='type-id-462' const='yes' id='type-id-1299'/>
-    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-684'/>
+    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-684'/>
     <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-464'/>
     <qualified-type-def type-id='type-id-464' const='yes' id='type-id-1300'/>
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-712'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-712'/>
     <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-472'/>
     <qualified-type-def type-id='type-id-472' const='yes' id='type-id-1301'/>
-    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-713'/>
+    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-713'/>
     <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-714'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-714'/>
     <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-469'/>
     <qualified-type-def type-id='type-id-469' const='yes' id='type-id-1302'/>
-    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1303'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1303'/>
     <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1304'/>
     <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-1305'/>
     <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1306'/>
@@ -10315,13 +10315,13 @@
     <reference-type-def kind='lvalue' type-id='type-id-1307' size-in-bits='64' id='type-id-1308'/>
     <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1220'/>
     <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1309'/>
-    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-719'/>
+    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-719'/>
     <pointer-type-def type-id='type-id-719' size-in-bits='64' id='type-id-459'/>
     <qualified-type-def type-id='type-id-459' const='yes' id='type-id-1310'/>
-    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-720'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-720'/>
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-475'/>
     <qualified-type-def type-id='type-id-475' const='yes' id='type-id-1311'/>
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-721'/>
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-721'/>
     <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-460'/>
     <qualified-type-def type-id='type-id-460' const='yes' id='type-id-1312'/>
     <qualified-type-def type-id='type-id-1002' const='yes' id='type-id-1313'/>
@@ -10329,21 +10329,21 @@
     <reference-type-def kind='lvalue' type-id='type-id-1313' size-in-bits='64' id='type-id-1314'/>
     <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-1316'/>
     <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1317'/>
-    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-722'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-722'/>
     <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-467'/>
     <qualified-type-def type-id='type-id-467' const='yes' id='type-id-1318'/>
-    <qualified-type-def type-id='type-id-835' const='yes' id='type-id-723'/>
+    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-723'/>
     <pointer-type-def type-id='type-id-723' size-in-bits='64' id='type-id-468'/>
     <qualified-type-def type-id='type-id-468' const='yes' id='type-id-1319'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-724'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-724'/>
     <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-463'/>
     <qualified-type-def type-id='type-id-463' const='yes' id='type-id-1320'/>
-    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-725'/>
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-725'/>
     <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-465'/>
     <qualified-type-def type-id='type-id-465' const='yes' id='type-id-1321'/>
-    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-728'/>
-    <qualified-type-def type-id='type-id-936' id='type-id-1322'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-936'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-728'/>
+    <qualified-type-def type-id='type-id-924' id='type-id-1322'/>
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-924'/>
     <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-477'/>
     <qualified-type-def type-id='type-id-477' const='yes' id='type-id-1323'/>
     <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1324'/>
@@ -10361,16 +10361,16 @@
     <qualified-type-def type-id='type-id-666' const='yes' id='type-id-777'/>
     <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-471'/>
     <qualified-type-def type-id='type-id-471' const='yes' id='type-id-1332'/>
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1095'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1030'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-1101'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1025'/>
     <qualified-type-def type-id='type-id-1267' const='yes' id='type-id-1333'/>
     <reference-type-def kind='lvalue' type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
     <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-1335'/>
     <qualified-type-def type-id='type-id-1269' const='yes' id='type-id-1336'/>
     <reference-type-def kind='lvalue' type-id='type-id-1336' size-in-bits='64' id='type-id-1337'/>
     <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1338'/>
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1031'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1102'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1026'/>
     <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1339'/>
     <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1341'/>
@@ -10379,19 +10379,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
     <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1345'/>
     <qualified-type-def type-id='type-id-1345' const='yes' id='type-id-1346'/>
-    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-788'/>
     <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1347'/>
     <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-474'/>
     <qualified-type-def type-id='type-id-474' const='yes' id='type-id-1348'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-789'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-789'/>
     <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-479'/>
     <qualified-type-def type-id='type-id-1292' const='yes' id='type-id-1349'/>
     <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1222'/>
-    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-790'/>
+    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-790'/>
     <pointer-type-def type-id='type-id-790' size-in-bits='64' id='type-id-478'/>
     <qualified-type-def type-id='type-id-478' const='yes' id='type-id-1350'/>
-    <qualified-type-def type-id='type-id-887' id='type-id-1351'/>
-    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-887'/>
+    <qualified-type-def type-id='type-id-816' id='type-id-1351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-816'/>
     <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1352'/>
     <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
     <qualified-type-def type-id='type-id-1353' const='yes' id='type-id-1354'/>
@@ -10431,7 +10431,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-831'>
+      <class-decl name='CmapSubtableFormat0' size-in-bits='2096' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='44' column='1' id='type-id-881'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='60' column='1'/>
         </data-member>
@@ -10442,7 +10442,7 @@
           <var-decl name='languageZ' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='glyphIdArray' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
@@ -10452,7 +10452,7 @@
         </data-member>
       </class-decl>
       <typedef-decl name='BYTE' type-id='type-id-84' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='631' column='1' id='type-id-1000'/>
-      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-833'>
+      <class-decl name='CmapSubtableFormat4' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='70' column='1' id='type-id-883'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='150' column='1'/>
         </data-member>
@@ -10475,16 +10475,16 @@
           <var-decl name='rangeShiftZ' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='157' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='values' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
+          <var-decl name='values' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='159' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='171' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='CmapSubtableFormat6' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='230' column='1' id='type-id-1362'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-836'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-886'/>
       </class-decl>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-836'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-886'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='formatReserved' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
@@ -10505,9 +10505,9 @@
         </data-member>
       </class-decl>
       <class-decl name='CmapSubtableFormat10' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='231' column='1' id='type-id-1363'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-837'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-887'/>
       </class-decl>
-      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-837'>
+      <class-decl name='CmapSubtableTrimmed&lt;OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='176' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='202' column='1' id='type-id-887'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='formatReserved' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='219' column='1'/>
         </data-member>
@@ -10521,27 +10521,27 @@
           <var-decl name='startCharCode' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='222' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='glyphIdArray' type-id='type-id-799' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
+          <var-decl name='glyphIdArray' type-id='type-id-850' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='224' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-799'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-850'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='CmapSubtableFormat12' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='262' column='1' id='type-id-1364'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-834'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-884'/>
       </class-decl>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-834'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat12&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-884'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
@@ -10555,28 +10555,28 @@
           <var-decl name='languageZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-973'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+      <class-decl name='SortedArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-961'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1030' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-795'>
+      <class-decl name='ArrayOf&lt;OT::CmapSubtableLongGroup, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-846'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-922' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -10600,9 +10600,9 @@
         </data-member>
       </class-decl>
       <class-decl name='CmapSubtableFormat13' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='269' column='1' id='type-id-1365'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-835'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-885'/>
       </class-decl>
-      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-835'>
+      <class-decl name='CmapSubtableLongSegmented&lt;OT::CmapSubtableFormat13&gt;' size-in-bits='224' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='235' column='1' id='type-id-885'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='251' column='1'/>
         </data-member>
@@ -10616,13 +10616,13 @@
           <var-decl name='languageZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='254' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='groups' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
+          <var-decl name='groups' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='256' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-832'>
+      <class-decl name='CmapSubtableFormat14' size-in-bits='168' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='368' column='1' id='type-id-882'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='383' column='1'/>
         </data-member>
@@ -10630,36 +10630,36 @@
           <var-decl name='lengthZ' type-id='type-id-386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='384' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='record' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
+          <var-decl name='record' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='389' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-972'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-826'/>
+      <class-decl name='SortedArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-960'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-876'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1031' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-1026' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-826'>
+      <class-decl name='ArrayOf&lt;OT::VariationSelectorRecord, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='120' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-876'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-859'>
+      <class-decl name='VariationSelectorRecord' size-in-bits='88' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='326' column='1' id='type-id-909'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='varSelector' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
+          <var-decl name='varSelector' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='358' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='defaultUVS' type-id='type-id-666' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='360' column='1'/>
@@ -10674,10 +10674,10 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-994'/>
-      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1102'>
+      <typedef-decl name='UINT24' type-id='type-id-1005' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='636' column='1' id='type-id-982'/>
+      <class-decl name='BEInt&lt;unsigned int, 3&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-1081'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-1113' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
+          <var-decl name='v' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='579' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-618'>
@@ -10685,7 +10685,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -10704,10 +10704,10 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='438' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format0' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
+              <var-decl name='format0' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='439' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format4' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
+              <var-decl name='format4' type-id='type-id-883' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='440' column='1'/>
             </data-member>
             <data-member access='private'>
               <var-decl name='format6' type-id='type-id-1362' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='441' column='1'/>
@@ -10722,7 +10722,7 @@
               <var-decl name='format13' type-id='type-id-1365' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='444' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format14' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
+              <var-decl name='format14' type-id='type-id-882' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='445' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -10733,12 +10733,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='448' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-796'>
+      <class-decl name='ArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-847'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-923' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -10746,12 +10746,12 @@
         <member-function access='public'>
           <function-decl name='lsearch&lt;OT::EncodingRecord&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-458' is-artificial='yes'/>
-            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-924'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-840'>
+      <class-decl name='EncodingRecord' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='453' column='1' id='type-id-890'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='platformID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='470' column='1'/>
         </data-member>
@@ -10768,12 +10768,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-825'>
+      <class-decl name='ArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-875'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-956' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -10781,7 +10781,7 @@
       </class-decl>
       <class-decl name='UnicodeValueRange' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='283' column='1' id='type-id-1009'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='startUnicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
+          <var-decl name='startUnicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='296' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
           <var-decl name='additionalCount' type-id='type-id-1000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
@@ -10793,12 +10793,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-824'>
+      <class-decl name='ArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-874'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='array' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -10806,10 +10806,10 @@
       </class-decl>
       <class-decl name='UVSMapping' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='306' column='1' id='type-id-1008'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='unicodeValue' type-id='type-id-994' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
+          <var-decl name='unicodeValue' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='317' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='24'>
-          <var-decl name='glyphID' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
+          <var-decl name='glyphID' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
@@ -10818,10 +10818,10 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-877'/>
+      <typedef-decl name='GlyphID' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='672' column='1' id='type-id-806'/>
       <class-decl name='IntType&lt;unsigned int, 3u&gt;' size-in-bits='24' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='613' column='1' id='type-id-1005'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-1102' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
+          <var-decl name='v' type-id='type-id-1081' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='626' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
@@ -10830,7 +10830,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-861'>
+      <class-decl name='cmap' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='479' column='1' id='type-id-911'>
         <data-member access='public' static='yes'>
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='480' column='1'/>
         </data-member>
@@ -10838,16 +10838,16 @@
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='506' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='encodingRecord' type-id='type-id-997' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
+          <var-decl name='encodingRecord' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='508' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='510' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-997'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-796'/>
+      <class-decl name='SortedArrayOf&lt;OT::EncodingRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-985'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-847'/>
       </class-decl>
-      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-860'>
+      <class-decl name='_hea' size-in-bits='288' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='46' column='1' id='type-id-910'>
         <data-member access='public' static='yes'>
           <var-decl name='tableTag' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='47' column='1'/>
         </data-member>
@@ -10861,25 +10861,25 @@
           <var-decl name='version' type-id='type-id-273' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='58' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='ascender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
+          <var-decl name='ascender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='59' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='48'>
-          <var-decl name='descender' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
+          <var-decl name='descender' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='lineGap' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
+          <var-decl name='lineGap' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='61' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='80'>
-          <var-decl name='advanceMax' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
+          <var-decl name='advanceMax' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='minLeadingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
+          <var-decl name='minLeadingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='64' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='112'>
-          <var-decl name='minTrailingBearing' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
+          <var-decl name='minTrailingBearing' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='maxExtent' type-id='type-id-995' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
+          <var-decl name='maxExtent' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='69' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='144'>
           <var-decl name='caretSlopeRise' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='71' column='1'/>
@@ -10915,24 +10915,24 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-995'/>
-      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-996'/>
+      <typedef-decl name='FWORD' type-id='type-id-452' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='639' column='1' id='type-id-983'/>
+      <typedef-decl name='UFWORD' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='642' column='1' id='type-id-984'/>
       <class-decl name='SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1269'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-825'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-875'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;' size-in-bits='72' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1267'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-824'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-874'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1335' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
@@ -11012,97 +11012,97 @@
     <qualified-type-def type-id='type-id-1275' const='yes' id='type-id-1373'/>
   </abi-instr>
   <abi-instr address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-937'>
+    <array-type-def dimensions='1' type-id='type-id-1003' size-in-bits='32' id='type-id-925'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-938'>
+    <array-type-def dimensions='1' type-id='type-id-1004' size-in-bits='16' id='type-id-926'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-939'>
+    <array-type-def dimensions='1' type-id='type-id-1005' size-in-bits='24' id='type-id-927'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-940'>
+    <array-type-def dimensions='1' type-id='type-id-1006' size-in-bits='32' id='type-id-928'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-850' size-in-bits='32' id='type-id-941'>
+    <array-type-def dimensions='1' type-id='type-id-900' size-in-bits='32' id='type-id-929'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-881' size-in-bits='16' id='type-id-863'>
+    <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='16' id='type-id-792'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-933'>
+    <array-type-def dimensions='1' type-id='type-id-630' size-in-bits='16' id='type-id-921'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-942'>
+    <array-type-def dimensions='1' type-id='type-id-631' size-in-bits='16' id='type-id-930'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-944'>
+    <array-type-def dimensions='1' type-id='type-id-632' size-in-bits='16' id='type-id-932'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-945'>
+    <array-type-def dimensions='1' type-id='type-id-634' size-in-bits='16' id='type-id-933'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-946'>
+    <array-type-def dimensions='1' type-id='type-id-635' size-in-bits='16' id='type-id-934'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-947'>
+    <array-type-def dimensions='1' type-id='type-id-636' size-in-bits='16' id='type-id-935'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-948'>
+    <array-type-def dimensions='1' type-id='type-id-639' size-in-bits='16' id='type-id-936'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-949'>
+    <array-type-def dimensions='1' type-id='type-id-640' size-in-bits='32' id='type-id-937'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-950'>
+    <array-type-def dimensions='1' type-id='type-id-646' size-in-bits='16' id='type-id-938'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-864'>
+    <array-type-def dimensions='1' type-id='type-id-647' size-in-bits='16' id='type-id-793'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-865'>
+    <array-type-def dimensions='1' type-id='type-id-648' size-in-bits='16' id='type-id-794'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-951'>
+    <array-type-def dimensions='1' type-id='type-id-649' size-in-bits='16' id='type-id-939'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-651' size-in-bits='16' id='type-id-1119'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-952'>
+    <array-type-def dimensions='1' type-id='type-id-656' size-in-bits='16' id='type-id-940'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-954'>
+    <array-type-def dimensions='1' type-id='type-id-657' size-in-bits='16' id='type-id-942'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-955'>
+    <array-type-def dimensions='1' type-id='type-id-658' size-in-bits='16' id='type-id-943'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-957'>
+    <array-type-def dimensions='1' type-id='type-id-661' size-in-bits='16' id='type-id-945'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-958'>
+    <array-type-def dimensions='1' type-id='type-id-662' size-in-bits='16' id='type-id-946'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-959'>
+    <array-type-def dimensions='1' type-id='type-id-664' size-in-bits='16' id='type-id-947'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-960'>
+    <array-type-def dimensions='1' type-id='type-id-667' size-in-bits='16' id='type-id-948'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-961'>
+    <array-type-def dimensions='1' type-id='type-id-668' size-in-bits='16' id='type-id-949'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-963'>
+    <array-type-def dimensions='1' type-id='type-id-1007' size-in-bits='48' id='type-id-951'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-854' size-in-bits='48' id='type-id-964'>
+    <array-type-def dimensions='1' type-id='type-id-904' size-in-bits='48' id='type-id-952'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-855' size-in-bits='48' id='type-id-965'>
+    <array-type-def dimensions='1' type-id='type-id-905' size-in-bits='48' id='type-id-953'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-856' size-in-bits='48' id='type-id-966'>
+    <array-type-def dimensions='1' type-id='type-id-906' size-in-bits='48' id='type-id-954'>
       <subrange length='1' type-id='type-id-4' id='type-id-171'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1077' size-in-bits='16' id='type-id-1074'>
@@ -11319,7 +11319,7 @@
         <var-decl name='has_mark' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='47' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1114'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1110'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -11333,7 +11333,7 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1115'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1111'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -11347,7 +11347,7 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1104'>
+    <class-decl name='hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='44' column='1' id='type-id-1083'>
       <data-member access='public' static='yes'>
         <var-decl name='mask_bytes' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
       </data-member>
@@ -11361,21 +11361,21 @@
         <var-decl name='mask' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1105'>
+    <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1084'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-1114' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1110' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-1115' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1111' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-928'/>
+    <typedef-decl name='hb_set_digest_t' type-id='type-id-1075' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='135' column='1' id='type-id-996'/>
     <class-decl name='hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 4u&gt;, hb_set_digest_combiner_t&lt;hb_set_digest_lowest_bits_t&lt;long unsigned int, 0u&gt;, hb_set_digest_lowest_bits_t&lt;long unsigned int, 9u&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='92' column='1' id='type-id-1075'>
       <data-member access='private' layout-offset-in-bits='0'>
-        <var-decl name='head' type-id='type-id-1104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
+        <var-decl name='head' type-id='type-id-1083' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='115' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <var-decl name='tail' type-id='type-id-1105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
+        <var-decl name='tail' type-id='type-id-1084' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='116' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='hb_auto_trace_t&lt;0, const OT::Coverage&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-1405'>
@@ -11394,7 +11394,7 @@
     </class-decl>
     <class-decl name='hb_ot_layout_lookup_accelerator_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='121' column='1' id='type-id-1407'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='digest' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
+        <var-decl name='digest' type-id='type-id-996' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='134' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='fini&lt;OT::SubstLookup&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11433,7 +11433,7 @@
       </member-function>
     </class-decl>
     <typedef-decl name='hb_void_t' type-id='type-id-1076' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='259' column='1' id='type-id-998'/>
-    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1112'/>
+    <class-decl name='_hb_void_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='258' column='1' id='type-id-1115'/>
     <class-decl name='hb_auto_trace_t&lt;0, const _hb_void_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='749' column='1' id='type-id-1412'>
       <member-function access='public'>
         <function-decl name='hb_auto_trace_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-private.hh' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11506,80 +11506,80 @@
     </enum-decl>
     <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1424'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1426'/>
     <qualified-type-def type-id='type-id-1426' const='yes' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-1428'/>
     <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1429'/>
     <reference-type-def kind='lvalue' type-id='type-id-1430' size-in-bits='64' id='type-id-1431'/>
     <pointer-type-def type-id='type-id-1430' size-in-bits='64' id='type-id-1432'/>
     <qualified-type-def type-id='type-id-1432' const='yes' id='type-id-1433'/>
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-1434'/>
     <qualified-type-def type-id='type-id-1434' const='yes' id='type-id-1435'/>
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-1436'/>
     <qualified-type-def type-id='type-id-1436' const='yes' id='type-id-1437'/>
-    <pointer-type-def type-id='type-id-793' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-1438'/>
     <qualified-type-def type-id='type-id-1438' const='yes' id='type-id-1439'/>
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-845' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-1441'/>
     <qualified-type-def type-id='type-id-1441' const='yes' id='type-id-1442'/>
-    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1443'/>
     <qualified-type-def type-id='type-id-1443' const='yes' id='type-id-1444'/>
-    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-1445'/>
+    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1445'/>
     <qualified-type-def type-id='type-id-1445' const='yes' id='type-id-1446'/>
     <reference-type-def kind='lvalue' type-id='type-id-618' size-in-bits='64' id='type-id-438'/>
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1447'/>
     <qualified-type-def type-id='type-id-1447' const='yes' id='type-id-1448'/>
-    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-1449'/>
+    <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-1449'/>
     <qualified-type-def type-id='type-id-1449' const='yes' id='type-id-1450'/>
-    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-1451'/>
+    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1451'/>
     <qualified-type-def type-id='type-id-1451' const='yes' id='type-id-1452'/>
     <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-422'/>
     <qualified-type-def type-id='type-id-422' const='yes' id='type-id-1453'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-943'/>
-    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1454'/>
-    <pointer-type-def type-id='type-id-804' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-931'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1454'/>
+    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1455'/>
     <qualified-type-def type-id='type-id-1455' const='yes' id='type-id-1456'/>
-    <pointer-type-def type-id='type-id-805' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1457'/>
     <qualified-type-def type-id='type-id-1457' const='yes' id='type-id-1458'/>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1459'/>
+    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1459'/>
     <qualified-type-def type-id='type-id-1459' const='yes' id='type-id-1460'/>
-    <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1461'/>
     <qualified-type-def type-id='type-id-1461' const='yes' id='type-id-1462'/>
-    <pointer-type-def type-id='type-id-808' size-in-bits='64' id='type-id-1463'/>
+    <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-1463'/>
     <qualified-type-def type-id='type-id-1463' const='yes' id='type-id-1464'/>
-    <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-1465'/>
+    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1465'/>
     <qualified-type-def type-id='type-id-1465' const='yes' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-1467'/>
+    <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-1467'/>
     <qualified-type-def type-id='type-id-1467' const='yes' id='type-id-1468'/>
     <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-443'/>
     <qualified-type-def type-id='type-id-443' const='yes' id='type-id-1469'/>
     <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-441'/>
     <qualified-type-def type-id='type-id-441' const='yes' id='type-id-1470'/>
-    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-1471'/>
+    <pointer-type-def type-id='type-id-862' size-in-bits='64' id='type-id-1471'/>
     <qualified-type-def type-id='type-id-1471' const='yes' id='type-id-1472'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-953'/>
-    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1473'/>
-    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-1474'/>
+    <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-941'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1473'/>
+    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-1474'/>
     <qualified-type-def type-id='type-id-1474' const='yes' id='type-id-1475'/>
-    <pointer-type-def type-id='type-id-814' size-in-bits='64' id='type-id-956'/>
-    <qualified-type-def type-id='type-id-956' const='yes' id='type-id-1476'/>
-    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1477'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-944'/>
+    <qualified-type-def type-id='type-id-944' const='yes' id='type-id-1476'/>
+    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1477'/>
     <qualified-type-def type-id='type-id-1477' const='yes' id='type-id-1478'/>
-    <pointer-type-def type-id='type-id-816' size-in-bits='64' id='type-id-1479'/>
+    <pointer-type-def type-id='type-id-867' size-in-bits='64' id='type-id-1479'/>
     <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
-    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1481'/>
     <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1482'/>
-    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-1483'/>
+    <pointer-type-def type-id='type-id-869' size-in-bits='64' id='type-id-1483'/>
     <qualified-type-def type-id='type-id-1483' const='yes' id='type-id-1484'/>
-    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-962'/>
-    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1485'/>
-    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-870' size-in-bits='64' id='type-id-950'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1485'/>
+    <pointer-type-def type-id='type-id-817' size-in-bits='64' id='type-id-1486'/>
     <qualified-type-def type-id='type-id-1486' const='yes' id='type-id-1487'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-871' size-in-bits='64' id='type-id-1488'/>
     <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-1489'/>
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-1490'/>
     <qualified-type-def type-id='type-id-1490' const='yes' id='type-id-1491'/>
-    <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-873' size-in-bits='64' id='type-id-1492'/>
     <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1493'/>
     <reference-type-def kind='lvalue' type-id='type-id-1494' size-in-bits='64' id='type-id-1495'/>
     <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-1496'/>
@@ -11587,13 +11587,13 @@
     <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1500'/>
     <qualified-type-def type-id='type-id-1500' const='yes' id='type-id-1501'/>
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-1502'/>
     <qualified-type-def type-id='type-id-1502' const='yes' id='type-id-1503'/>
-    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-1504'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-1504'/>
     <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-1505'/>
-    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-1506'/>
+    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-1506'/>
     <qualified-type-def type-id='type-id-1506' const='yes' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-1508'/>
     <qualified-type-def type-id='type-id-1508' const='yes' id='type-id-1509'/>
     <qualified-type-def type-id='type-id-1510' id='type-id-1511'/>
     <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1510'/>
@@ -11601,11 +11601,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-1515' size-in-bits='64' id='type-id-1513'/>
     <qualified-type-def type-id='type-id-1516' id='type-id-1517'/>
     <reference-type-def kind='lvalue' type-id='type-id-1518' size-in-bits='64' id='type-id-1516'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1519'/>
     <qualified-type-def type-id='type-id-1519' const='yes' id='type-id-1520'/>
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1521'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1521'/>
     <qualified-type-def type-id='type-id-1521' const='yes' id='type-id-1522'/>
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-1523'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1523'/>
     <qualified-type-def type-id='type-id-1523' const='yes' id='type-id-1524'/>
     <reference-type-def kind='lvalue' type-id='type-id-1525' size-in-bits='64' id='type-id-1526'/>
     <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-1527'/>
@@ -11616,11 +11616,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
     <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1535'/>
     <qualified-type-def type-id='type-id-1535' const='yes' id='type-id-1536'/>
-    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-1537'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-1537'/>
     <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1538'/>
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <qualified-type-def type-id='type-id-1540' const='yes' id='type-id-1541'/>
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-1542'/>
+    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-1542'/>
     <qualified-type-def type-id='type-id-1542' const='yes' id='type-id-1543'/>
     <qualified-type-def type-id='type-id-1544' id='type-id-1545'/>
     <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1544'/>
@@ -11628,52 +11628,52 @@
     <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1547'/>
     <qualified-type-def type-id='type-id-1550' id='type-id-1551'/>
     <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1550'/>
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-1553'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1553'/>
     <qualified-type-def type-id='type-id-1553' const='yes' id='type-id-1554'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1555'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1555'/>
     <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1556'/>
-    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1557'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-1557'/>
     <qualified-type-def type-id='type-id-1557' const='yes' id='type-id-1558'/>
     <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-434'/>
     <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-416'/>
     <qualified-type-def type-id='type-id-416' const='yes' id='type-id-1559'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-870'/>
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1560'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-799'/>
+    <qualified-type-def type-id='type-id-799' const='yes' id='type-id-1560'/>
     <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-426'/>
     <qualified-type-def type-id='type-id-426' const='yes' id='type-id-1561'/>
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-1562'/>
+    <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-1562'/>
     <qualified-type-def type-id='type-id-1562' const='yes' id='type-id-1563'/>
     <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-430'/>
     <qualified-type-def type-id='type-id-430' const='yes' id='type-id-1564'/>
-    <pointer-type-def type-id='type-id-869' size-in-bits='64' id='type-id-1565'/>
+    <pointer-type-def type-id='type-id-798' size-in-bits='64' id='type-id-1565'/>
     <qualified-type-def type-id='type-id-1565' const='yes' id='type-id-1566'/>
     <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-1568'/>
     <qualified-type-def type-id='type-id-1568' const='yes' id='type-id-1569'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1570'/>
     <qualified-type-def type-id='type-id-1570' const='yes' id='type-id-1571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1572'/>
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-889' size-in-bits='64' id='type-id-1572'/>
+    <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-1573'/>
     <qualified-type-def type-id='type-id-1573' const='yes' id='type-id-1574'/>
     <reference-type-def kind='lvalue' type-id='type-id-1003' size-in-bits='64' id='type-id-1575'/>
     <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1576'/>
     <qualified-type-def type-id='type-id-1576' const='yes' id='type-id-1577'/>
     <pointer-type-def type-id='type-id-1578' size-in-bits='64' id='type-id-1579'/>
     <qualified-type-def type-id='type-id-1579' const='yes' id='type-id-1580'/>
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-1581'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-1581'/>
     <qualified-type-def type-id='type-id-1581' const='yes' id='type-id-1582'/>
-    <pointer-type-def type-id='type-id-841' size-in-bits='64' id='type-id-1583'/>
+    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-1583'/>
     <qualified-type-def type-id='type-id-1583' const='yes' id='type-id-1584'/>
-    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1585'/>
-    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-1586'/>
+    <reference-type-def kind='lvalue' type-id='type-id-892' size-in-bits='64' id='type-id-1585'/>
+    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-1586'/>
     <qualified-type-def type-id='type-id-1586' const='yes' id='type-id-1587'/>
     <reference-type-def kind='lvalue' type-id='type-id-1588' size-in-bits='64' id='type-id-1589'/>
     <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-1590'/>
     <qualified-type-def type-id='type-id-1590' const='yes' id='type-id-1591'/>
-    <pointer-type-def type-id='type-id-843' size-in-bits='64' id='type-id-1592'/>
+    <pointer-type-def type-id='type-id-893' size-in-bits='64' id='type-id-1592'/>
     <qualified-type-def type-id='type-id-1592' const='yes' id='type-id-1593'/>
-    <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-1594'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-1594'/>
     <qualified-type-def type-id='type-id-1594' const='yes' id='type-id-1595'/>
-    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-1596'/>
+    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-1596'/>
     <qualified-type-def type-id='type-id-1596' const='yes' id='type-id-1597'/>
     <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1598'/>
     <qualified-type-def type-id='type-id-1598' const='yes' id='type-id-1599'/>
@@ -11688,8 +11688,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-1610'/>
     <qualified-type-def type-id='type-id-279' const='yes' id='type-id-1611'/>
     <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-1612'/>
-    <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-1613'/>
-    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1614'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1613'/>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-1614'/>
     <qualified-type-def type-id='type-id-1614' const='yes' id='type-id-1615'/>
     <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
     <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-1618'/>
@@ -11703,7 +11703,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-627' size-in-bits='64' id='type-id-448'/>
     <pointer-type-def type-id='type-id-627' size-in-bits='64' id='type-id-418'/>
     <qualified-type-def type-id='type-id-418' const='yes' id='type-id-1625'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1626'/>
+    <pointer-type-def type-id='type-id-834' size-in-bits='64' id='type-id-1626'/>
     <qualified-type-def type-id='type-id-1626' const='yes' id='type-id-1627'/>
     <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-440'/>
     <qualified-type-def type-id='type-id-440' const='yes' id='type-id-1628'/>
@@ -11717,7 +11717,7 @@
     <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
     <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-1637'/>
     <qualified-type-def type-id='type-id-1637' const='yes' id='type-id-1638'/>
-    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-1639'/>
+    <pointer-type-def type-id='type-id-897' size-in-bits='64' id='type-id-1639'/>
     <qualified-type-def type-id='type-id-1639' const='yes' id='type-id-1640'/>
     <reference-type-def kind='lvalue' type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
     <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1643'/>
@@ -11726,20 +11726,20 @@
     <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1647'/>
     <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
     <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1650'/>
-    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1651'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-1651'/>
     <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1652'/>
     <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1654'/>
     <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1655'/>
-    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-1656'/>
+    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-1656'/>
     <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1657'/>
-    <reference-type-def kind='lvalue' type-id='type-id-850' size-in-bits='64' id='type-id-1658'/>
-    <pointer-type-def type-id='type-id-850' size-in-bits='64' id='type-id-1659'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1658'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1659'/>
     <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1660'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-832' size-in-bits='64' id='type-id-1661'/>
     <qualified-type-def type-id='type-id-1661' const='yes' id='type-id-1662'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-1663'/>
     <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-881' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-810' size-in-bits='64' id='type-id-1665'/>
     <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
     <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-1668'/>
     <reference-type-def kind='lvalue' type-id='type-id-1669' size-in-bits='64' id='type-id-1670'/>
@@ -11845,14 +11845,14 @@
     <qualified-type-def type-id='type-id-508' const='yes' id='type-id-1736'/>
     <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-1738'/>
     <qualified-type-def type-id='type-id-1738' const='yes' id='type-id-1739'/>
-    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1740'/>
+    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1740'/>
     <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1741'/>
-    <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-1742'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1742'/>
     <qualified-type-def type-id='type-id-1742' const='yes' id='type-id-1743'/>
-    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-1744'/>
-    <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-1745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-1744'/>
+    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1745'/>
     <qualified-type-def type-id='type-id-1745' const='yes' id='type-id-1746'/>
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-884'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-813'/>
     <reference-type-def kind='lvalue' type-id='type-id-1422' size-in-bits='64' id='type-id-1747'/>
     <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-1748'/>
     <qualified-type-def type-id='type-id-1748' const='yes' id='type-id-1749'/>
@@ -11861,14 +11861,14 @@
     <qualified-type-def type-id='type-id-1752' const='yes' id='type-id-1753'/>
     <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-1754'/>
     <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1756'/>
-    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-1757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-1756'/>
+    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-1757'/>
     <qualified-type-def type-id='type-id-1757' const='yes' id='type-id-1758'/>
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1759'/>
-    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1760'/>
+    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1759'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-1760'/>
     <qualified-type-def type-id='type-id-1760' const='yes' id='type-id-1761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-856' size-in-bits='64' id='type-id-1762'/>
-    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-1763'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1762'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1763'/>
     <qualified-type-def type-id='type-id-1763' const='yes' id='type-id-1764'/>
     <reference-type-def kind='lvalue' type-id='type-id-1765' size-in-bits='64' id='type-id-1766'/>
     <pointer-type-def type-id='type-id-1765' size-in-bits='64' id='type-id-1767'/>
@@ -11876,9 +11876,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-1769' size-in-bits='64' id='type-id-1770'/>
     <pointer-type-def type-id='type-id-1769' size-in-bits='64' id='type-id-1771'/>
     <qualified-type-def type-id='type-id-1771' const='yes' id='type-id-1772'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1773'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1773'/>
     <qualified-type-def type-id='type-id-1773' const='yes' id='type-id-1774'/>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1775'/>
     <qualified-type-def type-id='type-id-1775' const='yes' id='type-id-1776'/>
     <reference-type-def kind='lvalue' type-id='type-id-1777' size-in-bits='64' id='type-id-1778'/>
     <pointer-type-def type-id='type-id-1777' size-in-bits='64' id='type-id-1779'/>
@@ -11894,11 +11894,11 @@
     <qualified-type-def type-id='type-id-1791' const='yes' id='type-id-1792'/>
     <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-1794'/>
     <qualified-type-def type-id='type-id-1794' const='yes' id='type-id-1795'/>
-    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1796'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-1796'/>
     <qualified-type-def type-id='type-id-1796' const='yes' id='type-id-1797'/>
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-1798'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1798'/>
     <qualified-type-def type-id='type-id-1798' const='yes' id='type-id-1799'/>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1800'/>
+    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-1800'/>
     <qualified-type-def type-id='type-id-1800' const='yes' id='type-id-1801'/>
     <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-425'/>
     <qualified-type-def type-id='type-id-425' const='yes' id='type-id-1802'/>
@@ -11941,93 +11941,93 @@
     <reference-type-def kind='lvalue' type-id='type-id-1864' size-in-bits='64' id='type-id-1865'/>
     <reference-type-def kind='lvalue' type-id='type-id-1866' size-in-bits='64' id='type-id-1867'/>
     <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1868'/>
-    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-985'/>
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1869'/>
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-896'/>
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1870'/>
-    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1038'/>
-    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1871'/>
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1872'/>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
-    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1873'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-894'/>
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1874'/>
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-892'/>
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1875'/>
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-910'/>
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1876'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-890'/>
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1877'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-973'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-1869'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-826'/>
+    <qualified-type-def type-id='type-id-826' const='yes' id='type-id-1870'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1871'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1036'/>
+    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1872'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1038'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1873'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-824'/>
+    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-1874'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-822'/>
+    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-1875'/>
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-840'/>
+    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-1876'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-820'/>
+    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-1877'/>
     <pointer-type-def type-id='type-id-1878' size-in-bits='64' id='type-id-1879'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1037'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1032'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1880'/>
     <qualified-type-def type-id='type-id-1420' const='yes' id='type-id-1881'/>
     <reference-type-def kind='lvalue' type-id='type-id-1881' size-in-bits='64' id='type-id-1396'/>
     <qualified-type-def type-id='type-id-1414' const='yes' id='type-id-1882'/>
     <reference-type-def kind='lvalue' type-id='type-id-1882' size-in-bits='64' id='type-id-1394'/>
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-1010'/>
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-932'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1079'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1050'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1883'/>
+    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-919' const='yes' id='type-id-1085'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1045'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1883'/>
     <qualified-type-def type-id='type-id-1883' const='yes' id='type-id-1884'/>
     <qualified-type-def type-id='type-id-1430' const='yes' id='type-id-1885'/>
     <reference-type-def kind='lvalue' type-id='type-id-1885' size-in-bits='64' id='type-id-1886'/>
     <pointer-type-def type-id='type-id-1885' size-in-bits='64' id='type-id-1887'/>
     <qualified-type-def type-id='type-id-1887' const='yes' id='type-id-1888'/>
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-675'/>
+    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-675'/>
     <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-591'/>
     <qualified-type-def type-id='type-id-591' const='yes' id='type-id-1889'/>
-    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-676'/>
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-676'/>
     <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-592'/>
     <qualified-type-def type-id='type-id-592' const='yes' id='type-id-1890'/>
-    <qualified-type-def type-id='type-id-793' const='yes' id='type-id-677'/>
+    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-677'/>
     <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-593'/>
     <qualified-type-def type-id='type-id-593' const='yes' id='type-id-1891'/>
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-678'/>
+    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-678'/>
     <qualified-type-def type-id='type-id-1892' id='type-id-1893'/>
     <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-1892'/>
     <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-598'/>
     <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1894'/>
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-681'/>
+    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-681'/>
     <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-590'/>
     <qualified-type-def type-id='type-id-590' const='yes' id='type-id-1895'/>
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-682'/>
     <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-537'/>
     <qualified-type-def type-id='type-id-537' const='yes' id='type-id-1896'/>
     <reference-type-def kind='lvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1897'/>
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-685'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-685'/>
     <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-548'/>
-    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-686'/>
     <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-577'/>
-    <qualified-type-def type-id='type-id-802' const='yes' id='type-id-687'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-687'/>
     <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-595'/>
     <qualified-type-def type-id='type-id-595' const='yes' id='type-id-1898'/>
     <qualified-type-def type-id='type-id-619' const='yes' id='type-id-688'/>
     <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-557'/>
     <qualified-type-def type-id='type-id-557' const='yes' id='type-id-1899'/>
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-689'/>
+    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-689'/>
     <pointer-type-def type-id='type-id-689' size-in-bits='64' id='type-id-601'/>
-    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-690'/>
     <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-518'/>
     <qualified-type-def type-id='type-id-518' const='yes' id='type-id-1900'/>
-    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-691'/>
     <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-522'/>
     <qualified-type-def type-id='type-id-522' const='yes' id='type-id-1901'/>
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-692'/>
+    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-692'/>
     <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-576'/>
     <qualified-type-def type-id='type-id-576' const='yes' id='type-id-1902'/>
-    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-693'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-693'/>
     <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-575'/>
     <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1903'/>
-    <qualified-type-def type-id='type-id-808' const='yes' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-859' const='yes' id='type-id-694'/>
     <pointer-type-def type-id='type-id-694' size-in-bits='64' id='type-id-580'/>
     <qualified-type-def type-id='type-id-580' const='yes' id='type-id-1904'/>
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-695'/>
     <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-533'/>
     <qualified-type-def type-id='type-id-533' const='yes' id='type-id-1905'/>
-    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-696'/>
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-696'/>
     <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-521'/>
     <qualified-type-def type-id='type-id-521' const='yes' id='type-id-1906'/>
     <qualified-type-def type-id='type-id-620' const='yes' id='type-id-697'/>
@@ -12036,40 +12036,40 @@
     <qualified-type-def type-id='type-id-621' const='yes' id='type-id-698'/>
     <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-565'/>
     <qualified-type-def type-id='type-id-565' const='yes' id='type-id-1908'/>
-    <qualified-type-def type-id='type-id-811' const='yes' id='type-id-699'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-699'/>
     <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-556'/>
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-700'/>
+    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-700'/>
     <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-587'/>
     <qualified-type-def type-id='type-id-587' const='yes' id='type-id-1909'/>
-    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-701'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-701'/>
     <pointer-type-def type-id='type-id-701' size-in-bits='64' id='type-id-585'/>
-    <qualified-type-def type-id='type-id-814' const='yes' id='type-id-702'/>
+    <qualified-type-def type-id='type-id-865' const='yes' id='type-id-702'/>
     <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-586'/>
     <qualified-type-def type-id='type-id-586' const='yes' id='type-id-1910'/>
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-703'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-703'/>
     <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-571'/>
     <qualified-type-def type-id='type-id-571' const='yes' id='type-id-1911'/>
-    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-704'/>
+    <qualified-type-def type-id='type-id-867' const='yes' id='type-id-704'/>
     <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-570'/>
     <qualified-type-def type-id='type-id-570' const='yes' id='type-id-1912'/>
-    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-705'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-705'/>
     <pointer-type-def type-id='type-id-705' size-in-bits='64' id='type-id-563'/>
     <qualified-type-def type-id='type-id-563' const='yes' id='type-id-1913'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-706'/>
+    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-706'/>
     <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-561'/>
-    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-707'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-707'/>
     <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-562'/>
     <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1914'/>
-    <qualified-type-def type-id='type-id-820' const='yes' id='type-id-708'/>
+    <qualified-type-def type-id='type-id-817' const='yes' id='type-id-708'/>
     <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-516'/>
     <qualified-type-def type-id='type-id-516' const='yes' id='type-id-1915'/>
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-709'/>
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-709'/>
     <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-545'/>
     <qualified-type-def type-id='type-id-545' const='yes' id='type-id-1916'/>
-    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-710'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-710'/>
     <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-540'/>
     <qualified-type-def type-id='type-id-540' const='yes' id='type-id-1917'/>
-    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-711'/>
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-711'/>
     <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-536'/>
     <qualified-type-def type-id='type-id-536' const='yes' id='type-id-1918'/>
     <qualified-type-def type-id='type-id-1494' const='yes' id='type-id-1919'/>
@@ -12081,29 +12081,29 @@
     <reference-type-def kind='lvalue' type-id='type-id-1924' size-in-bits='64' id='type-id-1925'/>
     <pointer-type-def type-id='type-id-1924' size-in-bits='64' id='type-id-1926'/>
     <qualified-type-def type-id='type-id-1926' const='yes' id='type-id-1927'/>
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-715'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-715'/>
     <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-523'/>
     <qualified-type-def type-id='type-id-523' const='yes' id='type-id-1928'/>
-    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-716'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-716'/>
     <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-524'/>
     <qualified-type-def type-id='type-id-524' const='yes' id='type-id-1929'/>
-    <qualified-type-def type-id='type-id-829' const='yes' id='type-id-717'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-717'/>
     <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-527'/>
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-1930'/>
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1020'/>
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1931'/>
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1081'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1056'/>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1932'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1086'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1015'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1931'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1087'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1051'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1932'/>
     <qualified-type-def type-id='type-id-1932' const='yes' id='type-id-1933'/>
-    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1082'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1057'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1934'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1088'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1088' size-in-bits='64' id='type-id-1052'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1934'/>
     <qualified-type-def type-id='type-id-1934' const='yes' id='type-id-1935'/>
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1083'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1936'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1089'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1936'/>
     <qualified-type-def type-id='type-id-1936' const='yes' id='type-id-1937'/>
     <qualified-type-def type-id='type-id-1525' const='yes' id='type-id-1938'/>
     <reference-type-def kind='lvalue' type-id='type-id-1938' size-in-bits='64' id='type-id-1939'/>
@@ -12117,49 +12117,49 @@
     <reference-type-def kind='lvalue' type-id='type-id-1946' size-in-bits='64' id='type-id-1947'/>
     <pointer-type-def type-id='type-id-1946' size-in-bits='64' id='type-id-1948'/>
     <qualified-type-def type-id='type-id-1948' const='yes' id='type-id-1949'/>
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-718'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-718'/>
     <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-531'/>
     <qualified-type-def type-id='type-id-531' const='yes' id='type-id-1950'/>
     <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-1951'/>
     <pointer-type-def type-id='type-id-1951' size-in-bits='64' id='type-id-1952'/>
     <qualified-type-def type-id='type-id-1952' const='yes' id='type-id-1953'/>
-    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-1084'/>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1024'/>
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1954'/>
-    <qualified-type-def type-id='type-id-1022' const='yes' id='type-id-1085'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-1053'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1955'/>
+    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-1090'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1019'/>
+    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1954'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1091'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1048'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1955'/>
     <qualified-type-def type-id='type-id-1955' const='yes' id='type-id-1956'/>
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1086'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-1054'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1957'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1092'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1049'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1957'/>
     <qualified-type-def type-id='type-id-1957' const='yes' id='type-id-1958'/>
-    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-726'/>
-    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1055'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-726'/>
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-1050'/>
     <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-574'/>
     <qualified-type-def type-id='type-id-574' const='yes' id='type-id-1959'/>
-    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-986'/>
     <qualified-type-def type-id='type-id-999' id='type-id-1960'/>
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-872'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1961'/>
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-919'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-801'/>
+    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-1961'/>
+    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-987'/>
     <qualified-type-def type-id='type-id-1962' id='type-id-1963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-1962'/>
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-874'/>
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1964'/>
-    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-920'/>
+    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-1962'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-1964'/>
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-988'/>
     <qualified-type-def type-id='type-id-1965' id='type-id-1966'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1965'/>
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-876'/>
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1967'/>
+    <reference-type-def kind='lvalue' type-id='type-id-988' size-in-bits='64' id='type-id-1965'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-805'/>
+    <qualified-type-def type-id='type-id-805' const='yes' id='type-id-1967'/>
     <qualified-type-def type-id='type-id-1567' const='yes' id='type-id-1968'/>
     <pointer-type-def type-id='type-id-1968' size-in-bits='64' id='type-id-1969'/>
-    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1087'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-1059'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1970'/>
+    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1093'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1054'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1970'/>
     <qualified-type-def type-id='type-id-1970' const='yes' id='type-id-1971'/>
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-727'/>
+    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-727'/>
     <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1972'/>
     <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-525'/>
     <qualified-type-def type-id='type-id-525' const='yes' id='type-id-1973'/>
@@ -12169,16 +12169,16 @@
     <qualified-type-def type-id='type-id-1578' const='yes' id='type-id-1977'/>
     <pointer-type-def type-id='type-id-1977' size-in-bits='64' id='type-id-1978'/>
     <qualified-type-def type-id='type-id-1978' const='yes' id='type-id-1979'/>
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1026'/>
-    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1980'/>
-    <qualified-type-def type-id='type-id-841' const='yes' id='type-id-729'/>
+    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1021'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1980'/>
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-729'/>
     <pointer-type-def type-id='type-id-729' size-in-bits='64' id='type-id-581'/>
     <qualified-type-def type-id='type-id-581' const='yes' id='type-id-1981'/>
-    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-1982'/>
+    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-1982'/>
     <pointer-type-def type-id='type-id-1982' size-in-bits='64' id='type-id-1983'/>
     <qualified-type-def type-id='type-id-1983' const='yes' id='type-id-1984'/>
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-730'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-730'/>
     <reference-type-def kind='lvalue' type-id='type-id-730' size-in-bits='64' id='type-id-1985'/>
     <pointer-type-def type-id='type-id-730' size-in-bits='64' id='type-id-551'/>
     <qualified-type-def type-id='type-id-551' const='yes' id='type-id-1986'/>
@@ -12186,18 +12186,18 @@
     <reference-type-def kind='lvalue' type-id='type-id-1987' size-in-bits='64' id='type-id-1988'/>
     <pointer-type-def type-id='type-id-1987' size-in-bits='64' id='type-id-1989'/>
     <qualified-type-def type-id='type-id-1989' const='yes' id='type-id-1990'/>
-    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-731'/>
+    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-731'/>
     <pointer-type-def type-id='type-id-731' size-in-bits='64' id='type-id-549'/>
-    <qualified-type-def type-id='type-id-844' const='yes' id='type-id-732'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-732'/>
     <reference-type-def kind='lvalue' type-id='type-id-732' size-in-bits='64' id='type-id-1991'/>
     <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-546'/>
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-733'/>
+    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-733'/>
     <pointer-type-def type-id='type-id-733' size-in-bits='64' id='type-id-547'/>
     <qualified-type-def type-id='type-id-340' const='yes' id='type-id-1992'/>
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1110'/>
-    <qualified-type-def type-id='type-id-1089' id='type-id-1046'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1993'/>
+    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-1095' id='type-id-1041'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1113' size-in-bits='64' id='type-id-1095'/>
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1993'/>
     <qualified-type-def type-id='type-id-1993' const='yes' id='type-id-1994'/>
     <qualified-type-def type-id='type-id-1600' const='yes' id='type-id-1995'/>
     <qualified-type-def type-id='type-id-1996' id='type-id-1423'/>
@@ -12218,11 +12218,11 @@
     <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-2007'/>
     <reference-type-def kind='lvalue' type-id='type-id-2007' size-in-bits='64' id='type-id-2008'/>
     <pointer-type-def type-id='type-id-2007' size-in-bits='64' id='type-id-2009'/>
-    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-2010'/>
+    <qualified-type-def type-id='type-id-964' const='yes' id='type-id-2010'/>
     <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2011'/>
     <qualified-type-def type-id='type-id-2011' const='yes' id='type-id-2012'/>
     <qualified-type-def type-id='type-id-346' const='yes' id='type-id-2013'/>
-    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-735'/>
     <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-2014'/>
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-538'/>
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-2015'/>
@@ -12242,11 +12242,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-2028' size-in-bits='64' id='type-id-2029'/>
     <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2030'/>
     <qualified-type-def type-id='type-id-2030' const='yes' id='type-id-2031'/>
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1011'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-978'/>
-    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1090'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-1052'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-2032'/>
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-1070'/>
+    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-966'/>
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1096'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-1047'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-2032'/>
     <qualified-type-def type-id='type-id-2032' const='yes' id='type-id-2033'/>
     <qualified-type-def type-id='type-id-629' const='yes' id='type-id-736'/>
     <qualified-type-def type-id='type-id-2034' id='type-id-2035'/>
@@ -12262,8 +12262,8 @@
     <qualified-type-def type-id='type-id-2042' const='yes' id='type-id-2043'/>
     <qualified-type-def type-id='type-id-1636' const='yes' id='type-id-2044'/>
     <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-2045'/>
-    <qualified-type-def type-id='type-id-847' const='yes' id='type-id-737'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1060'/>
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1055'/>
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-600'/>
     <qualified-type-def type-id='type-id-600' const='yes' id='type-id-2046'/>
     <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-2047'/>
@@ -12275,26 +12275,26 @@
     <qualified-type-def type-id='type-id-2052' const='yes' id='type-id-2053'/>
     <qualified-type-def type-id='type-id-1648' const='yes' id='type-id-2054'/>
     <pointer-type-def type-id='type-id-2054' size-in-bits='64' id='type-id-2055'/>
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-738'/>
-    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1061'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-738'/>
+    <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-1056'/>
     <pointer-type-def type-id='type-id-738' size-in-bits='64' id='type-id-603'/>
     <qualified-type-def type-id='type-id-603' const='yes' id='type-id-2056'/>
     <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-2057'/>
     <pointer-type-def type-id='type-id-2057' size-in-bits='64' id='type-id-2058'/>
-    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-739'/>
-    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1062'/>
+    <qualified-type-def type-id='type-id-899' const='yes' id='type-id-739'/>
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-1057'/>
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-604'/>
     <qualified-type-def type-id='type-id-604' const='yes' id='type-id-2059'/>
-    <qualified-type-def type-id='type-id-850' const='yes' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-740'/>
     <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-2060'/>
     <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-596'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1012'/>
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-981'/>
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1091'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1049'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-2061'/>
+    <qualified-type-def type-id='type-id-832' const='yes' id='type-id-1071'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-1097'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-2061'/>
     <qualified-type-def type-id='type-id-2061' const='yes' id='type-id-2062'/>
-    <qualified-type-def type-id='type-id-881' const='yes' id='type-id-2063'/>
+    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-2063'/>
     <reference-type-def kind='lvalue' type-id='type-id-2063' size-in-bits='64' id='type-id-2064'/>
     <pointer-type-def type-id='type-id-2063' size-in-bits='64' id='type-id-2065'/>
     <qualified-type-def type-id='type-id-2065' const='yes' id='type-id-2066'/>
@@ -12439,15 +12439,15 @@
     <qualified-type-def type-id='type-id-582' const='yes' id='type-id-2132'/>
     <qualified-type-def type-id='type-id-1737' const='yes' id='type-id-2133'/>
     <pointer-type-def type-id='type-id-2133' size-in-bits='64' id='type-id-2134'/>
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-780'/>
-    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1065'/>
+    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-780'/>
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1060'/>
     <pointer-type-def type-id='type-id-780' size-in-bits='64' id='type-id-607'/>
     <qualified-type-def type-id='type-id-607' const='yes' id='type-id-2135'/>
-    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-781'/>
-    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-781'/>
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-1061'/>
     <pointer-type-def type-id='type-id-781' size-in-bits='64' id='type-id-608'/>
     <qualified-type-def type-id='type-id-608' const='yes' id='type-id-2136'/>
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-782'/>
     <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-2137'/>
     <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-588'/>
     <qualified-type-def type-id='type-id-588' const='yes' id='type-id-2138'/>
@@ -12461,27 +12461,27 @@
     <reference-type-def kind='lvalue' type-id='type-id-2144' size-in-bits='64' id='type-id-2145'/>
     <pointer-type-def type-id='type-id-2144' size-in-bits='64' id='type-id-2146'/>
     <qualified-type-def type-id='type-id-2146' const='yes' id='type-id-2147'/>
-    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1111'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1111' size-in-bits='64' id='type-id-2148'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1103'/>
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-2149'/>
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-783'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1114'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-2148'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-2149'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-783'/>
     <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-2150'/>
     <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-554'/>
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-921'/>
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-882'/>
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-784'/>
+    <qualified-type-def type-id='type-id-974' const='yes' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-784'/>
     <reference-type-def kind='lvalue' type-id='type-id-784' size-in-bits='64' id='type-id-2151'/>
     <pointer-type-def type-id='type-id-784' size-in-bits='64' id='type-id-541'/>
     <qualified-type-def type-id='type-id-541' const='yes' id='type-id-2152'/>
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-922'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-883'/>
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-812'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-785'/>
     <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-2153'/>
     <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-543'/>
     <qualified-type-def type-id='type-id-543' const='yes' id='type-id-2154'/>
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-923'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-885'/>
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-814'/>
     <qualified-type-def type-id='type-id-2155' const='yes' id='type-id-2156'/>
     <pointer-type-def type-id='type-id-2156' size-in-bits='64' id='type-id-2157'/>
     <qualified-type-def type-id='type-id-2157' const='yes' id='type-id-2158'/>
@@ -12499,11 +12499,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-2171' size-in-bits='64' id='type-id-2172'/>
     <pointer-type-def type-id='type-id-2171' size-in-bits='64' id='type-id-2173'/>
     <qualified-type-def type-id='type-id-2173' const='yes' id='type-id-2174'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1013'/>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-991'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-1092'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-1051'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-2175'/>
+    <qualified-type-def type-id='type-id-838' const='yes' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-979'/>
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1098'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1046'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-2175'/>
     <qualified-type-def type-id='type-id-2175' const='yes' id='type-id-2176'/>
     <qualified-type-def type-id='type-id-1777' const='yes' id='type-id-2177'/>
     <reference-type-def kind='lvalue' type-id='type-id-2177' size-in-bits='64' id='type-id-2178'/>
@@ -12525,75 +12525,75 @@
     <qualified-type-def type-id='type-id-2193' const='yes' id='type-id-2194'/>
     <qualified-type-def type-id='type-id-1793' const='yes' id='type-id-2195'/>
     <pointer-type-def type-id='type-id-2195' size-in-bits='64' id='type-id-2196'/>
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-786'/>
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1063'/>
+    <qualified-type-def type-id='type-id-907' const='yes' id='type-id-786'/>
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1058'/>
     <pointer-type-def type-id='type-id-786' size-in-bits='64' id='type-id-605'/>
     <qualified-type-def type-id='type-id-605' const='yes' id='type-id-2197'/>
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-787'/>
-    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1064'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-787'/>
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-1059'/>
     <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-606'/>
     <qualified-type-def type-id='type-id-606' const='yes' id='type-id-2198'/>
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-1014'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-993'/>
-    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1093'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1047'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-2199'/>
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-1073'/>
+    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-981'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-1099'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-2199'/>
     <qualified-type-def type-id='type-id-2199' const='yes' id='type-id-2200'/>
-    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1094'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1094' size-in-bits='64' id='type-id-1048'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-2201'/>
+    <qualified-type-def type-id='type-id-670' const='yes' id='type-id-1100'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-2201'/>
     <qualified-type-def type-id='type-id-2201' const='yes' id='type-id-2202'/>
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-924'/>
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-886'/>
-    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-925'/>
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-888'/>
+    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-992'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-815'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-818'/>
     <qualified-type-def type-id='type-id-2203' const='yes' id='type-id-2204'/>
     <pointer-type-def type-id='type-id-2204' size-in-bits='64' id='type-id-2205'/>
     <qualified-type-def type-id='type-id-2206' const='yes' id='type-id-2207'/>
     <pointer-type-def type-id='type-id-2207' size-in-bits='64' id='type-id-2208'/>
-    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-926'/>
-    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-1409'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-889'/>
-    <qualified-type-def type-id='type-id-889' const='yes' id='type-id-2209'/>
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-927'/>
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1027'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-909'/>
-    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-2210'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-994'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-1409'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-819'/>
+    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-2209'/>
+    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-995'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-839'/>
+    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-2210'/>
     <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-2211'/>
-    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1097'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-2212'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1040'/>
+    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-1103'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-2212'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1035'/>
     <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-2213'/>
     <pointer-type-def type-id='type-id-2213' size-in-bits='64' id='type-id-2214'/>
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-2215'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-2215'/>
     <pointer-type-def type-id='type-id-2215' size-in-bits='64' id='type-id-2216'/>
     <qualified-type-def type-id='type-id-2216' const='yes' id='type-id-2217'/>
     <qualified-type-def type-id='type-id-913' const='yes' id='type-id-2218'/>
     <pointer-type-def type-id='type-id-2218' size-in-bits='64' id='type-id-2219'/>
     <qualified-type-def type-id='type-id-2219' const='yes' id='type-id-2220'/>
-    <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-2221'/>
+    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-2221'/>
     <pointer-type-def type-id='type-id-2221' size-in-bits='64' id='type-id-2222'/>
     <qualified-type-def type-id='type-id-2222' const='yes' id='type-id-2223'/>
-    <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-2224'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-2224'/>
     <pointer-type-def type-id='type-id-2224' size-in-bits='64' id='type-id-2225'/>
     <qualified-type-def type-id='type-id-2225' const='yes' id='type-id-2226'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-2227'/>
+    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-2227'/>
     <pointer-type-def type-id='type-id-2227' size-in-bits='64' id='type-id-2228'/>
     <qualified-type-def type-id='type-id-2228' const='yes' id='type-id-2229'/>
     <qualified-type-def type-id='type-id-914' const='yes' id='type-id-2230'/>
     <pointer-type-def type-id='type-id-2230' size-in-bits='64' id='type-id-2231'/>
     <qualified-type-def type-id='type-id-2231' const='yes' id='type-id-2232'/>
-    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-2233'/>
+    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-2233'/>
     <qualified-type-def type-id='type-id-915' const='yes' id='type-id-2234'/>
     <pointer-type-def type-id='type-id-2234' size-in-bits='64' id='type-id-2235'/>
     <qualified-type-def type-id='type-id-2235' const='yes' id='type-id-2236'/>
-    <qualified-type-def type-id='type-id-893' const='yes' id='type-id-2237'/>
+    <qualified-type-def type-id='type-id-823' const='yes' id='type-id-2237'/>
     <qualified-type-def type-id='type-id-917' const='yes' id='type-id-2238'/>
     <pointer-type-def type-id='type-id-2238' size-in-bits='64' id='type-id-2239'/>
     <qualified-type-def type-id='type-id-2239' const='yes' id='type-id-2240'/>
-    <qualified-type-def type-id='type-id-1112' const='yes' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1104'/>
     <qualified-type-def type-id='type-id-1076' id='type-id-2241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1076'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-1076'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-1416'/>
     <qualified-type-def type-id='type-id-150' const='yes' id='type-id-2242'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-2243'/>
@@ -12621,22 +12621,22 @@
     <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-2260'/>
     <pointer-type-def type-id='type-id-2260' size-in-bits='64' id='type-id-2261'/>
     <qualified-type-def type-id='type-id-2261' const='yes' id='type-id-2262'/>
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-2263'/>
+    <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-2263'/>
     <pointer-type-def type-id='type-id-2263' size-in-bits='64' id='type-id-2264'/>
     <qualified-type-def type-id='type-id-2264' const='yes' id='type-id-2265'/>
     <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-2266'/>
     <pointer-type-def type-id='type-id-2266' size-in-bits='64' id='type-id-2267'/>
     <qualified-type-def type-id='type-id-2267' const='yes' id='type-id-2268'/>
-    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-2269'/>
+    <qualified-type-def type-id='type-id-1110' const='yes' id='type-id-2269'/>
     <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2270'/>
     <qualified-type-def type-id='type-id-2270' const='yes' id='type-id-2271'/>
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-2272'/>
+    <qualified-type-def type-id='type-id-1083' const='yes' id='type-id-2272'/>
     <pointer-type-def type-id='type-id-2272' size-in-bits='64' id='type-id-2273'/>
     <qualified-type-def type-id='type-id-2273' const='yes' id='type-id-2274'/>
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-2275'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-2275'/>
     <pointer-type-def type-id='type-id-2275' size-in-bits='64' id='type-id-2276'/>
     <qualified-type-def type-id='type-id-2276' const='yes' id='type-id-2277'/>
-    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-2278'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-2278'/>
     <pointer-type-def type-id='type-id-2278' size-in-bits='64' id='type-id-2279'/>
     <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-2280'/>
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-2281'/>
@@ -12656,24 +12656,24 @@
     <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-2288'/>
     <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-2289'/>
     <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-2290'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-2291'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-2291'/>
     <qualified-type-def type-id='type-id-2291' const='yes' id='type-id-2292'/>
     <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-2293'/>
     <qualified-type-def type-id='type-id-2293' const='yes' id='type-id-2294'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-2295'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-2295'/>
     <qualified-type-def type-id='type-id-2295' const='yes' id='type-id-2296'/>
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-2297'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-2297'/>
     <qualified-type-def type-id='type-id-2297' const='yes' id='type-id-2298'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-2299'/>
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-2299'/>
     <qualified-type-def type-id='type-id-2299' const='yes' id='type-id-2300'/>
-    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-873'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1045'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1070'/>
+    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-802'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1040'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1065'/>
     <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-1390'/>
     <pointer-type-def type-id='type-id-2302' size-in-bits='64' id='type-id-2303'/>
     <namespace-decl name='OT'>
-      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-841'>
+      <class-decl name='ExtensionFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2177' column='1' id='type-id-891'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2187' column='1'/>
         </data-member>
@@ -12695,18 +12695,18 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-863' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-808'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-859'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -12750,7 +12750,7 @@
       </class-decl>
       <class-decl name='Ligature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='601' column='1' id='type-id-626'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
+          <var-decl name='ligGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='695' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <var-decl name='component' type-id='type-id-625' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='697' column='1'/>
@@ -12761,10 +12761,10 @@
       </class-decl>
       <class-decl name='RangeRecord' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='132' column='1' id='type-id-1007'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='start' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
+          <var-decl name='start' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='end' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
+          <var-decl name='end' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='152' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <var-decl name='value' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='153' column='1'/>
@@ -12777,22 +12777,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1103' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-1082' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='LigatureSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='705' column='1' id='type-id-627'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='ligature' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
+          <var-decl name='ligature' type-id='type-id-807' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='774' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='777' column='1'/>
@@ -12802,15 +12802,15 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-618'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-886' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-815' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='SubstLookupSubTable' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1086' column='1' id='type-id-674'>
         <member-type access='public'>
-          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-898'>
+          <enum-decl name='Type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1089' column='1' id='type-id-828'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='Single' value='1'/>
             <enumerator name='Multiple' value='2'/>
@@ -12823,60 +12823,60 @@
           </enum-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-899'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1135' column='1' id='type-id-829'>
             <member-type access='private'>
-              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-900'>
+              <class-decl name='__anonymous_struct__' size-in-bits='16' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1136' column='1' id='type-id-830'>
                 <data-member access='public' layout-offset-in-bits='0'>
                   <var-decl name='sub_format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1137' column='1'/>
                 </data-member>
               </class-decl>
             </member-type>
             <data-member access='private'>
-              <var-decl name='header' type-id='type-id-900' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
+              <var-decl name='header' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1138' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='single' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
+              <var-decl name='single' type-id='type-id-831' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1139' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='multiple' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
+              <var-decl name='multiple' type-id='type-id-832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1140' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='alternate' type-id='type-id-903' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
+              <var-decl name='alternate' type-id='type-id-833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1141' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='ligature' type-id='type-id-904' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
+              <var-decl name='ligature' type-id='type-id-834' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1142' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='context' type-id='type-id-905' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
+              <var-decl name='context' type-id='type-id-835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1143' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='chainContext' type-id='type-id-906' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
+              <var-decl name='chainContext' type-id='type-id-836' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='extension' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-837' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='reverseChainContextSingle' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
+              <var-decl name='reverseChainContextSingle' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
+          <var-decl name='u' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1147' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1149' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-909' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-839' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::MarkGlyphSets, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-651'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -12888,37 +12888,37 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-629'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-889' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-819' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12933,7 +12933,7 @@
           <var-decl name='subTable' type-id='type-id-619' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='613' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='markFilteringSetX' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
+          <var-decl name='markFilteringSetX' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='614' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='618' column='1'/>
@@ -12949,21 +12949,21 @@
         </data-member>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-672'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-820'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-888' is-artificial='yes'/>
-            <parameter type-id='type-id-887'/>
+            <parameter type-id='type-id-818' is-artificial='yes'/>
+            <parameter type-id='type-id-816'/>
             <return type-id='type-id-9'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-820'>
+      <class-decl name='ArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-963' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -12988,9 +12988,9 @@
       </class-decl>
       <class-decl name='CoverageFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='629' column='1' id='type-id-623'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-868'>
+          <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-797'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-874' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-803' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='681' column='1'/>
@@ -13008,24 +13008,24 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-874' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-874' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-803' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='CoverageFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='694' column='1' id='type-id-624'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-869'>
+          <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-798'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-876' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-805' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='792' column='1'/>
@@ -13049,25 +13049,25 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-876' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-876' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-805' is-artificial='yes'/>
+            <parameter type-id='type-id-804'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-809'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-860'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -13127,14 +13127,14 @@
       </class-decl>
       <class-decl name='Coverage' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='807' column='1' id='type-id-622'>
         <member-type access='public'>
-          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-866'>
+          <class-decl name='Iter' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='872' column='1' id='type-id-795'>
             <member-type access='private'>
-              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-867'>
+              <union-decl name='__anonymous_union__' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='913' column='1' id='type-id-796'>
                 <data-member access='private'>
-                  <var-decl name='format1' type-id='type-id-868' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
+                  <var-decl name='format1' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='914' column='1'/>
                 </data-member>
                 <data-member access='private'>
-                  <var-decl name='format2' type-id='type-id-869' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
+                  <var-decl name='format2' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='915' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
@@ -13142,18 +13142,18 @@
               <var-decl name='format' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='912' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='u' type-id='type-id-867' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
+              <var-decl name='u' type-id='type-id-796' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='916' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Iter' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-870' is-artificial='yes'/>
+                <parameter type-id='type-id-799' is-artificial='yes'/>
                 <return type-id='type-id-13'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-871'>
+          <union-decl name='__anonymous_union__' size-in-bits='80' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='920' column='1' id='type-id-800'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='921' column='1'/>
             </data-member>
@@ -13166,21 +13166,21 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-871' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
+          <var-decl name='u' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='924' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='926' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-872' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-801' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-660'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13193,13 +13193,13 @@
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='284' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='coverage' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
+          <var-decl name='coverage' type-id='type-id-860' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='289' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-881'>
+      <class-decl name='Offset&lt;OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='683' column='1' id='type-id-810'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
@@ -13216,7 +13216,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='859' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ligatureSet' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
+          <var-decl name='ligatureSet' type-id='type-id-808' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='862' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='865' column='1'/>
@@ -13245,7 +13245,7 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-865' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-794' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -13253,9 +13253,9 @@
       </class-decl>
       <class-decl name='hb_apply_context_t' size-in-bits='640' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='262' column='1' id='type-id-913'>
         <member-type access='public'>
-          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1033'>
+          <class-decl name='matcher_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='319' column='1' id='type-id-1028'>
             <member-type access='public'>
-              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1034'>
+              <enum-decl name='may_match_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='342' column='1' id='type-id-1029'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='MATCH_NO' value='0'/>
                 <enumerator name='MATCH_YES' value='1'/>
@@ -13263,7 +13263,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1035'>
+              <enum-decl name='may_skip_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='361' column='1' id='type-id-1030'>
                 <underlying-type type-id='type-id-11'/>
                 <enumerator name='SKIP_NO' value='0'/>
                 <enumerator name='SKIP_YES' value='1'/>
@@ -13271,7 +13271,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1036'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <var-decl name='lookup_props' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='384' column='1'/>
@@ -13289,40 +13289,40 @@
               <var-decl name='syllable' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='388' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='match_func' type-id='type-id-1036' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
+              <var-decl name='match_func' type-id='type-id-1031' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='389' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='192'>
               <var-decl name='match_data' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='390' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='matcher_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-1033' is-artificial='yes'/>
                 <return type-id='type-id-13'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1039'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1034'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='526' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='530' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1041' is-artificial='yes'/>
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-1036' is-artificial='yes'/>
+                <parameter type-id='type-id-826'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -13332,18 +13332,18 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1042'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1037'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='c' type-id='type-id-896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
+              <var-decl name='c' type-id='type-id-826' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='456' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='128'>
-              <var-decl name='matcher' type-id='type-id-1033' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
+              <var-decl name='matcher' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1040' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1035' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='460' column='1'/>
@@ -13353,8 +13353,8 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1043' is-artificial='yes'/>
-                <parameter type-id='type-id-896'/>
+                <parameter type-id='type-id-1038' is-artificial='yes'/>
+                <parameter type-id='type-id-826'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-12'/>
                 <parameter type-id='type-id-1'/>
@@ -13364,10 +13364,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1044'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1040' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1039'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-897'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='265' column='1' id='type-id-827'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='264' column='1'/>
@@ -13394,7 +13394,7 @@
           <var-decl name='auto_zwj' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='288' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recurse_func' type-id='type-id-1044' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1039' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='289' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='290' column='1'/>
@@ -13403,7 +13403,7 @@
           <var-decl name='lookup_props' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='291' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='gdef' type-id='type-id-1046' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1041' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='has_glyph_classes' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='293' column='1'/>
@@ -13413,7 +13413,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
             <parameter type-id='type-id-12'/>
             <parameter type-id='type-id-143'/>
             <parameter type-id='type-id-161'/>
@@ -13422,147 +13422,147 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-896' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::LangSys, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-644'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13574,7 +13574,7 @@
             <parameter type-id='type-id-480' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-883'/>
+            <parameter type-id='type-id-812'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13584,15 +13584,15 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-864' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-855'>
+      <class-decl name='Record&lt;OT::LangSys&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-905'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-987'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-975'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -13608,7 +13608,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::FeatureParams, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-643'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13630,13 +13630,13 @@
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='972' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
+          <var-decl name='array' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='973' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='975' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-844'>
+      <class-decl name='FeatureParamsSize' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='262' column='1' id='type-id-894'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='designSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='332' column='1'/>
         </data-member>
@@ -13659,7 +13659,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='368' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-845'>
+      <class-decl name='FeatureParamsStylisticSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='373' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='version' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='381' column='1'/>
         </data-member>
@@ -13673,7 +13673,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='401' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-843'>
+      <class-decl name='FeatureParamsCharacterVariants' size-in-bits='136' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='406' column='1' id='type-id-893'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='413' column='1'/>
         </data-member>
@@ -13693,25 +13693,25 @@
           <var-decl name='firstParamUILabelNameID' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='431' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='characters' type-id='type-id-800' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
+          <var-decl name='characters' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='442' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-819'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-870'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-961' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-949' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-962' is-artificial='yes'/>
+            <parameter type-id='type-id-950' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -13719,19 +13719,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-800'>
+      <class-decl name='ArrayOf&lt;OT::IntType&lt;unsigned int, 3u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='40' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-851'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::SubstLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-668'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13752,13 +13752,13 @@
         <member-type access='private'>
           <union-decl name='__anonymous_union__' size-in-bits='136' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='466' column='1' id='type-id-2305'>
             <data-member access='private'>
-              <var-decl name='size' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
+              <var-decl name='size' type-id='type-id-894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='467' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='stylisticSet' type-id='type-id-845' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
+              <var-decl name='stylisticSet' type-id='type-id-895' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='468' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='characterVariants' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
+              <var-decl name='characterVariants' type-id='type-id-893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='469' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -13773,7 +13773,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-639'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13783,7 +13783,7 @@
       </class-decl>
       <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-916'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-911'/>
+          <typedef-decl name='return_t' type-id='type-id-999' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-841'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='238' column='1'/>
@@ -13793,152 +13793,152 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-910' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-980'>
+      <class-decl name='MultipleSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='328' column='1' id='type-id-968'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='393' column='1'/>
         </data-member>
@@ -13946,13 +13946,13 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='395' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='sequence' type-id='type-id-1028' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
+          <var-decl name='sequence' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='398' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='401' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-931'>
+      <class-decl name='AlternateSubstFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='453' column='1' id='type-id-919'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='544' column='1'/>
         </data-member>
@@ -13960,14 +13960,14 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='546' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='alternateSet' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
+          <var-decl name='alternateSet' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='549' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='552' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Device, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-641'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -13975,7 +13975,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-839'>
+      <class-decl name='Device' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1101' column='1' id='type-id-889'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='startSize' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1157' column='1'/>
         </data-member>
@@ -13986,13 +13986,13 @@
           <var-decl name='deltaFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1159' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='deltaValue' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
+          <var-decl name='deltaValue' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1164' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1166' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1022'>
+      <class-decl name='ContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1250' column='1' id='type-id-1017'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1323' column='1'/>
         </data-member>
@@ -14000,13 +14000,13 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1325' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1328' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1331' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1023'>
+      <class-decl name='ContextFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1336' column='1' id='type-id-1018'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1415' column='1'/>
         </data-member>
@@ -14017,14 +14017,14 @@
           <var-decl name='classDef' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1420' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='ruleSet' type-id='type-id-1101' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1080' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1423' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1426' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::ClassDef, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-637'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14032,12 +14032,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-830'>
+      <class-decl name='ClassDefFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='935' column='1' id='type-id-880'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='classFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='981' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='startGlyph' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
+          <var-decl name='startGlyph' type-id='type-id-806' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='982' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
           <var-decl name='classValue' type-id='type-id-618' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='984' column='1'/>
@@ -14048,13 +14048,13 @@
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='952' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-531' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-838'>
+      <class-decl name='ContextFormat3' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1431' column='1' id='type-id-888'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1510' column='1'/>
         </data-member>
@@ -14065,16 +14065,16 @@
           <var-decl name='lookupCount' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1513' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='coverageZ' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
+          <var-decl name='coverageZ' type-id='type-id-936' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1515' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1517' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1520' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1017'>
+      <class-decl name='ChainContextFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1812' column='1' id='type-id-1012'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1883' column='1'/>
         </data-member>
@@ -14082,7 +14082,7 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1885' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1888' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1891' column='1'/>
@@ -14101,7 +14101,7 @@
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1008' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1952' is-artificial='yes'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
@@ -14114,7 +14114,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1087' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-830' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
+              <var-decl name='format1' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1088' column='1'/>
             </data-member>
             <data-member access='private'>
               <var-decl name='format2' type-id='type-id-1539' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1089' column='1'/>
@@ -14128,7 +14128,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1092' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1018'>
+      <class-decl name='ChainContextFormat2' size-in-bits='112' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1895' column='1' id='type-id-1013'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1995' column='1'/>
         </data-member>
@@ -14145,14 +14145,14 @@
           <var-decl name='lookaheadClassDef' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2008' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='ruleSet' type-id='type-id-1100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
+          <var-decl name='ruleSet' type-id='type-id-1079' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2012' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2015' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::AttachList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-633'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14165,13 +14165,13 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='81' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='attachPoint' type-id='type-id-1015' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
+          <var-decl name='attachPoint' type-id='type-id-1010' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='84' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='87' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-990'>
+      <class-decl name='ReverseChainSingleSubstFormat1' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='929' column='1' id='type-id-978'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1032' column='1'/>
         </data-member>
@@ -14179,10 +14179,10 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1034' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1037' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1041' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
           <var-decl name='substituteX' type-id='type-id-618' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1045' column='1'/>
@@ -14191,22 +14191,22 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1048' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1015'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-804'/>
+      <class-decl name='OffsetArrayOf&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1010'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-855'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-804'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-855'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::ArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-632'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14214,28 +14214,28 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1019'>
+      <class-decl name='ChainContextFormat3' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2019' column='1' id='type-id-1014'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2121' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='backtrack' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
+          <var-decl name='backtrack' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2123' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='inputX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
+          <var-decl name='inputX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2127' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='80'>
-          <var-decl name='lookaheadX' type-id='type-id-1029' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
+          <var-decl name='lookaheadX' type-id='type-id-1024' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2131' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='112'>
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2135' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2138' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::LigCaretList, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-645'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14243,59 +14243,59 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-975'>
+      <class-decl name='Extension&lt;OT::ExtensionSubst&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2199' column='1' id='type-id-963'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1025'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2247' column='1' id='type-id-1020'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1025' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
+          <var-decl name='u' type-id='type-id-1020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2250' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <return type-id='type-id-1027'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1026' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1021' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14311,21 +14311,21 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::LigGlyph&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2307'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-861'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-810'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-861'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-950' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::LigGlyph, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-646'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14333,9 +14333,9 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-901'>
+      <class-decl name='SingleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='194' column='1' id='type-id-831'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-992'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='244' column='1' id='type-id-980'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='245' column='1'/>
             </data-member>
@@ -14348,41 +14348,41 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-992' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
+          <var-decl name='u' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='248' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-993' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-981' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14395,71 +14395,71 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::CaretValue&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2308'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-805'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-856'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-805'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-856'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-902'>
+      <class-decl name='MultipleSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='405' column='1' id='type-id-832'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-979'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='442' column='1' id='type-id-967'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='443' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-980' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
+              <var-decl name='format1' type-id='type-id-968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='444' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-979' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
+          <var-decl name='u' type-id='type-id-967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='445' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-981' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-969' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::CaretValue, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14467,57 +14467,57 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-903'>
+      <class-decl name='AlternateSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='556' column='1' id='type-id-833'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-930'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='593' column='1' id='type-id-918'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='594' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
+              <var-decl name='format1' type-id='type-id-919' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='595' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
+          <var-decl name='u' type-id='type-id-918' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='596' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-920' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-827'>
+      <class-decl name='CaretValueFormat1' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='95' column='1' id='type-id-877'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='110' column='1'/>
         </data-member>
@@ -14531,9 +14531,9 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='113' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-904'>
+      <class-decl name='LigatureSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='869' column='1' id='type-id-834'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-977'>
+          <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='909' column='1' id='type-id-965'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='910' column='1'/>
             </data-member>
@@ -14543,179 +14543,179 @@
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
+          <var-decl name='u' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='912' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-978' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-966' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-974'>
+      <class-decl name='Context' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1524' column='1' id='type-id-962'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1021'>
+          <union-decl name='__anonymous_union__' size-in-bits='96' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1549' column='1' id='type-id-1016'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1550' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-1022' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
+              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1551' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-1023' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
+              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1552' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-838' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
+              <var-decl name='format3' type-id='type-id-888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1553' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
+          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1554' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1024' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1019' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-970'>
+      <class-decl name='ChainContext' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2142' column='1' id='type-id-958'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1016'>
+          <union-decl name='__anonymous_union__' size-in-bits='160' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2167' column='1' id='type-id-1011'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2168' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-1017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
+              <var-decl name='format1' type-id='type-id-1012' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2169' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-1018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
+              <var-decl name='format2' type-id='type-id-1013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2170' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-1019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
+              <var-decl name='format3' type-id='type-id-1014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2171' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-1016' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
+          <var-decl name='u' type-id='type-id-1011' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2172' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1020' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-908'>
+      <class-decl name='ReverseChainSingleSubst' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1052' column='1' id='type-id-838'>
         <member-type access='protected'>
-          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-989'>
+          <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1073' column='1' id='type-id-977'>
             <data-member access='private'>
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1074' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
+              <var-decl name='format1' type-id='type-id-978' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1075' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='u' type-id='type-id-989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
+          <var-decl name='u' type-id='type-id-977' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1076' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-890'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-894'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-824'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-991' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-979' is-artificial='yes'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-828'>
+      <class-decl name='CaretValueFormat2' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='117' column='1' id='type-id-878'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='136' column='1'/>
         </data-member>
@@ -14729,7 +14729,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='139' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-829'>
+      <class-decl name='CaretValueFormat3' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='143' column='1' id='type-id-879'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='caretValueFormat' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='159' column='1'/>
         </data-member>
@@ -14753,13 +14753,13 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='194' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-827' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
+              <var-decl name='format1' type-id='type-id-877' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='195' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-828' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
+              <var-decl name='format2' type-id='type-id-878' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='196' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-829' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
+              <var-decl name='format3' type-id='type-id-879' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='197' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -14771,7 +14771,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::RecordListOf&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-659'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14780,7 +14780,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::Lookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-653'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14789,7 +14789,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::SubstLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14798,7 +14798,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Anchor, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-630'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14806,7 +14806,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-791'>
+      <class-decl name='AnchorFormat1' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='220' column='1' id='type-id-842'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='234' column='1'/>
         </data-member>
@@ -14823,7 +14823,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='238' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-792'>
+      <class-decl name='AnchorFormat2' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='242' column='1' id='type-id-843'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='263' column='1'/>
         </data-member>
@@ -14843,7 +14843,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='268' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-793'>
+      <class-decl name='AnchorFormat3' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='272' column='1' id='type-id-844'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='291' column='1'/>
         </data-member>
@@ -14873,13 +14873,13 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='333' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-791' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
+              <var-decl name='format1' type-id='type-id-842' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='334' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-792' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
+              <var-decl name='format2' type-id='type-id-843' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='335' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format3' type-id='type-id-793' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
+              <var-decl name='format3' type-id='type-id-844' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='336' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -14891,7 +14891,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::MarkArray, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-650'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14900,20 +14900,20 @@
         </data-member>
       </class-decl>
       <class-decl name='MarkArray' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='392' column='1' id='type-id-1632'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-802'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-853'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-802'>
+      <class-decl name='ArrayOf&lt;OT::MarkRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-853'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-941' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-850'>
+      <class-decl name='MarkRecord' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='374' column='1' id='type-id-900'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='klass' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='383' column='1'/>
         </data-member>
@@ -14927,12 +14927,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='388' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-794'>
+      <class-decl name='AnchorMatrix' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='344' column='1' id='type-id-845'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='rows' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='363' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='matrixZ' type-id='type-id-933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
+          <var-decl name='matrixZ' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='366' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='369' column='1'/>
@@ -14962,7 +14962,7 @@
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14971,7 +14971,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Ligature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-647'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14980,7 +14980,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::AnchorMatrix&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-652'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -14998,7 +14998,7 @@
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::OffsetListOf&lt;OT::PosLookup&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-654'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15007,7 +15007,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-661'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15016,7 +15016,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::LigatureSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-648'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15032,10 +15032,10 @@
           <var-decl name='lookupCount' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1184' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='inputZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
+          <var-decl name='inputZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1185' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='lookupRecordX' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
+          <var-decl name='lookupRecordX' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1190' column='1'/>
@@ -15057,10 +15057,10 @@
       </class-decl>
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-914'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1068' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1067'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1062'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-895'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-825'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='58' column='1'/>
@@ -15069,10 +15069,10 @@
           <var-decl name='face' type-id='type-id-144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='glyphs' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='77' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='recurse_func' type-id='type-id-1067' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1062' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='78' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='79' column='1'/>
@@ -15082,104 +15082,104 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-894' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-895'/>
+            <parameter type-id='type-id-824' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-825'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-915'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1070' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1069'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1065' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1064'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-893'/>
+          <typedef-decl name='return_t' type-id='type-id-998' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='147' column='1' id='type-id-823'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='146' column='1'/>
@@ -15188,22 +15188,22 @@
           <var-decl name='face' type-id='type-id-144' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='193' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='before' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
+          <var-decl name='before' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='input' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
+          <var-decl name='input' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='195' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='after' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
+          <var-decl name='after' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='196' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='output' type-id='type-id-875' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
+          <var-decl name='output' type-id='type-id-804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='recurse_func' type-id='type-id-1069' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
+          <var-decl name='recurse_func' type-id='type-id-1064' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='recursed_lookups' type-id='type-id-1071' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
+          <var-decl name='recursed_lookups' type-id='type-id-1066' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='199' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='66880'>
           <var-decl name='nesting_level_left' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='200' column='1'/>
@@ -15213,167 +15213,167 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
-            <parameter type-id='type-id-875'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
+            <parameter type-id='type-id-804'/>
             <parameter type-id='type-id-12'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
             <parameter type-id='type-id-9' is-artificial='yes'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1063'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1059'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1059'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1060'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1056'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1062'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1065'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1066'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1061'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-892' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-917'>
         <member-type access='public'>
-          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-891'/>
+          <typedef-decl name='return_t' type-id='type-id-1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='109' column='1' id='type-id-821'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
@@ -15395,7 +15395,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
             <parameter type-id='type-id-144'/>
             <parameter type-id='type-id-152'/>
             <parameter type-id='type-id-12'/>
@@ -15405,105 +15405,105 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1047'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1043'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1049'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1044'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1050'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1045'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1051'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1047'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1053'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1048'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1054'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1056'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1051'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1057'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-890' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-891'/>
+            <parameter type-id='type-id-820' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
+            <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1028'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-817'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Sequence&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1023'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-868'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-817'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-868'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-959' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Sequence, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-664'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15519,31 +15519,31 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='324' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1029'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-808'/>
+      <class-decl name='OffsetArrayOf&lt;OT::Coverage&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1024'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-859'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-879'>
+      <class-decl name='OffsetArrayOf&lt;OT::LigatureSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-808'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-621'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-878'>
+      <class-decl name='OffsetArrayOf&lt;OT::Ligature&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-807'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-620'/>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1101'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-816'/>
+      <class-decl name='OffsetArrayOf&lt;OT::RuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1080'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-867'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-816'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-867'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-958' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::RuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-662'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15560,14 +15560,14 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::Rule&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2314'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-815'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-866'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-815'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Rule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-866'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-957' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-945' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -15614,23 +15614,23 @@
           <var-decl name='match' type-id='type-id-2320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='640' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='match_func_t' type-id='type-id-1037' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-2320'/>
-      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1100'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-807'/>
+      <typedef-decl name='match_func_t' type-id='type-id-1032' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='628' column='1' id='type-id-2320'/>
+      <class-decl name='OffsetArrayOf&lt;OT::ChainRuleSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-1079'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-858'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-807'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-858'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-947' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-935' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::ChainRuleSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-636'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15647,21 +15647,21 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::ChainRule&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2321'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-857'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-806'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-857'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-946' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-934' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::ChainRule, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-635'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15680,18 +15680,18 @@
           <var-decl name='lookaheadX' type-id='type-id-618' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1749' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='96'>
-          <var-decl name='lookupX' type-id='type-id-801' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
+          <var-decl name='lookupX' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1752' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1755' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-801'>
+      <class-decl name='ArrayOf&lt;OT::LookupRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-852'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -15721,7 +15721,7 @@
           <var-decl name='match_data' type-id='type-id-1387' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1575' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-857'>
+      <class-decl name='SinglePosFormat1' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='434' column='1' id='type-id-907'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='466' column='1'/>
         </data-member>
@@ -15729,19 +15729,19 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='468' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='470' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='472' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='476' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-982'>
+      <class-decl name='ValueFormat' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='50' column='1' id='type-id-970'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-280'/>
         <member-type access='public'>
-          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1032'>
+          <enum-decl name='Flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='51' column='1' id='type-id-1027'>
             <underlying-type type-id='type-id-11'/>
             <enumerator name='xPlacement' value='1'/>
             <enumerator name='yPlacement' value='2'/>
@@ -15758,8 +15758,8 @@
         </member-type>
       </class-decl>
       <typedef-decl name='Value' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-1077'/>
-      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-984'/>
-      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-858'>
+      <typedef-decl name='ValueRecord' type-id='type-id-1074' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-972'/>
+      <class-decl name='SinglePosFormat2' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='480' column='1' id='type-id-908'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='515' column='1'/>
         </data-member>
@@ -15767,19 +15767,19 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='517' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
+          <var-decl name='valueFormat' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='519' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
           <var-decl name='valueCount' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='521' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='522' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='525' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1109'>
+      <class-decl name='CursivePosFormat1' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='875' column='1' id='type-id-1112'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='976' column='1'/>
         </data-member>
@@ -15787,18 +15787,18 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='978' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='entryExitRecord' type-id='type-id-797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
+          <var-decl name='entryExitRecord' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='981' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='984' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-797'>
+      <class-decl name='ArrayOf&lt;OT::EntryExitRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-848'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -15818,7 +15818,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='871' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-847'>
+      <class-decl name='MarkBasePosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1022' column='1' id='type-id-897'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1068' column='1'/>
         </data-member>
@@ -15844,7 +15844,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1083' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-848'>
+      <class-decl name='MarkLigPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1126' column='1' id='type-id-898'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1188' column='1'/>
         </data-member>
@@ -15870,7 +15870,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1204' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-849'>
+      <class-decl name='MarkMarkPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1242' column='1' id='type-id-899'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1306' column='1'/>
         </data-member>
@@ -15896,7 +15896,7 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1323' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-851'>
+      <class-decl name='PairPosFormat1' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='654' column='1' id='type-id-901'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='700' column='1'/>
         </data-member>
@@ -15904,43 +15904,43 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='702' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='704' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='707' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='pairSet' type-id='type-id-983' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
+          <var-decl name='pairSet' type-id='type-id-971' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='711' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='714' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-983'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
+      <class-decl name='OffsetArrayOf&lt;OT::PairSet&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-971'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-863'/>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-812'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-863'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-940' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;OT::PairSet::sanitize_closure_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-953' is-artificial='yes'/>
+            <parameter type-id='type-id-941' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::PairSet, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -15952,19 +15952,19 @@
             <parameter type-id='type-id-509' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-884'/>
+            <parameter type-id='type-id-813'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-853'>
+      <class-decl name='PairSet' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='575' column='1' id='type-id-903'>
         <member-type access='public'>
           <class-decl name='sanitize_closure_t' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='627' column='1' id='type-id-912'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='base' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='628' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='valueFormats' type-id='type-id-985' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
+              <var-decl name='valueFormats' type-id='type-id-973' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='629' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='len1' type-id='type-id-12' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='630' column='1'/>
@@ -15978,13 +15978,13 @@
           <var-decl name='len' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='646' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='arrayZ' type-id='type-id-880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
+          <var-decl name='arrayZ' type-id='type-id-809' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='647' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='650' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-852'>
+      <class-decl name='PairPosFormat2' size-in-bits='144' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='718' column='1' id='type-id-902'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='791' column='1'/>
         </data-member>
@@ -15992,10 +15992,10 @@
           <var-decl name='coverage' type-id='type-id-639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='793' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='32'>
-          <var-decl name='valueFormat1' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
+          <var-decl name='valueFormat1' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='795' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='48'>
-          <var-decl name='valueFormat2' type-id='type-id-982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
+          <var-decl name='valueFormat2' type-id='type-id-970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='798' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='64'>
           <var-decl name='classDef1' type-id='type-id-637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='802' column='1'/>
@@ -16010,23 +16010,23 @@
           <var-decl name='class2Count' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='811' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='values' type-id='type-id-984' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
+          <var-decl name='values' type-id='type-id-972' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='813' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='817' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-905'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+      <class-decl name='ContextSubst' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='916' column='1' id='type-id-835'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
-      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-906'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+      <class-decl name='ChainContextSubst' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='918' column='1' id='type-id-836'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-907'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-837'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16050,10 +16050,10 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='553' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-857' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
+              <var-decl name='format1' type-id='type-id-907' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='554' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
+              <var-decl name='format2' type-id='type-id-908' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='555' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16063,22 +16063,22 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2196' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2196' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2196' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16089,10 +16089,10 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='845' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-851' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
+              <var-decl name='format1' type-id='type-id-901' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='846' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format2' type-id='type-id-852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
+              <var-decl name='format2' type-id='type-id-902' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='847' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16102,22 +16102,22 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2134' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2134' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2134' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16128,7 +16128,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1010' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-1109' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
+              <var-decl name='format1' type-id='type-id-1112' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1011' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16138,22 +16138,22 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1969' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1969' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1969' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16164,7 +16164,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1109' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
+              <var-decl name='format1' type-id='type-id-897' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1110' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16174,22 +16174,22 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2045' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2045' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2045' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16200,7 +16200,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1230' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
+              <var-decl name='format1' type-id='type-id-898' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1231' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16210,22 +16210,22 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2055' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2055' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2055' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16236,7 +16236,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1349' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-849' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
+              <var-decl name='format1' type-id='type-id-899' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1350' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16246,30 +16246,30 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2058' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2058' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2058' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='ContextPos' size-in-bits='96' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1355' column='1' id='type-id-2328'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-974'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-962'/>
       </class-decl>
       <class-decl name='ChainContextPos' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1357' column='1' id='type-id-2329'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
       </class-decl>
       <class-decl name='ExtensionPos' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-2330'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1578'/>
@@ -16281,7 +16281,7 @@
               <var-decl name='format' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2248' column='1'/>
             </data-member>
             <data-member access='private'>
-              <var-decl name='format1' type-id='type-id-841' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
+              <var-decl name='format1' type-id='type-id-891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2249' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
@@ -16297,8 +16297,8 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1978' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-911'/>
+            <parameter type-id='type-id-840'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16367,14 +16367,14 @@
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2146' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
+            <parameter type-id='type-id-840'/>
             <parameter type-id='type-id-12'/>
-            <return type-id='type-id-911'/>
+            <return type-id='type-id-841'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-649'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16383,7 +16383,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-667'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16392,7 +16392,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16405,27 +16405,27 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-873'/>
+            <parameter type-id='type-id-802'/>
             <return type-id='type-id-13'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-893'/>
+            <parameter type-id='type-id-822'/>
+            <return type-id='type-id-823'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2142' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-897'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Script, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-663'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16437,14 +16437,14 @@
             <parameter type-id='type-id-514' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-885'/>
+            <parameter type-id='type-id-814'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-856'>
+      <class-decl name='Record&lt;OT::Script&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-906'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-988'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-976'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -16460,7 +16460,7 @@
         </data-member>
       </class-decl>
       <class-decl name='OffsetTo&lt;OT::Feature, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='16' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='741' column='1' id='type-id-642'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-881'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-810'/>
         <data-member access='public' static='yes'>
           <var-decl name='static_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
         </data-member>
@@ -16472,14 +16472,14 @@
             <parameter type-id='type-id-515' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
-            <parameter type-id='type-id-882'/>
+            <parameter type-id='type-id-811'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-854'>
+      <class-decl name='Record&lt;OT::Feature&gt;' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='59' column='1' id='type-id-904'>
         <member-type access='public'>
-          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-986'/>
+          <class-decl name='sanitize_closure_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-974'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='tag' type-id='type-id-306' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='74' column='1'/>
@@ -16494,23 +16494,23 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='79' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-823'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-873'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-798'>
+      <class-decl name='ArrayOf&lt;OT::Index, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-849'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
@@ -16522,74 +16522,74 @@
           <var-decl name='NOT_FOUND_INDEX' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-822'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-872'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-953' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-821'>
+      <class-decl name='ArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-871'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-811'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::Lookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-862'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-951' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-939' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-818'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::SubstLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-869'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-948' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-813'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookup, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-864'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-954' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-814'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::PosLookupSubTable, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-865'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-955' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-943' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-956' is-artificial='yes'/>
+            <parameter type-id='type-id-944' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -16597,19 +16597,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-803'>
+      <class-decl name='ArrayOf&lt;OT::OffsetTo&lt;OT::AnchorMatrix, OT::IntType&lt;short unsigned int, 2u&gt; &gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='793' column='1' id='type-id-854'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='len' type-id='type-id-280' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='892' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='array' type-id='type-id-942' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
+          <var-decl name='array' type-id='type-id-930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='893' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-943' is-artificial='yes'/>
+            <parameter type-id='type-id-931' is-artificial='yes'/>
             <parameter type-id='type-id-309'/>
             <parameter type-id='type-id-33'/>
             <parameter type-id='type-id-12'/>
@@ -16618,7 +16618,7 @@
         </member-function>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2203'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-822'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-872'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2205' is-artificial='yes'/>
@@ -16631,7 +16631,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2203'/>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2206'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-823'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-873'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2208' is-artificial='yes'/>
@@ -16644,19 +16644,19 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2335'/>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::Lookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2335'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-811'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
       </class-decl>
       <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-2155'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2336'/>
       </class-decl>
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-2336'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-821'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-871'/>
       </class-decl>
       <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1765'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2155'/>
       </class-decl>
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-976'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-798'/>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-964'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-849'/>
       </class-decl>
       <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-2163'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2206'/>
@@ -16675,12 +16675,12 @@
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='254' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-842'>
+      <class-decl name='Feature' size-in-bits='48' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='475' column='1' id='type-id-892'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='featureParams' type-id='type-id-643' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lookupIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='538' column='1'/>
@@ -16690,7 +16690,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2337'/>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::SubstLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2337'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-818'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-869'/>
       </class-decl>
       <class-decl name='OffsetListOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1666'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2338'/>
@@ -16704,23 +16704,23 @@
         </member-function>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::AnchorMatrix&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2338'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-803'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-854'/>
       </class-decl>
       <class-decl name='OffsetListOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='905' column='1' id='type-id-1673'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2339'/>
       </class-decl>
       <class-decl name='OffsetArrayOf&lt;OT::PosLookup&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='900' column='1' id='type-id-2339'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-813'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-864'/>
       </class-decl>
-      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-846'>
+      <class-decl name='LangSys' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='183' column='1' id='type-id-896'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='lookupOrderZ' type-id='type-id-881' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
+          <var-decl name='lookupOrderZ' type-id='type-id-810' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='207' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <var-decl name='reqFeatureIndex' type-id='type-id-415' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='featureIndex' type-id='type-id-976' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='214' column='1'/>
@@ -16921,7 +16921,7 @@
     <function-decl name='hb_ot_layout_get_glyphs_in_class' mangled-name='hb_ot_layout_get_glyphs_in_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyphs_in_class'>
       <parameter type-id='type-id-144' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
       <parameter type-id='type-id-1425' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='140' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='141' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_find_script' mangled-name='hb_ot_layout_table_find_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_find_script'>
@@ -16937,23 +16937,23 @@
       <parameter type-id='type-id-2281' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
       <parameter type-id='type-id-2281' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
       <parameter type-id='type-id-2281' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
-      <parameter type-id='type-id-875' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
+      <parameter type-id='type-id-804' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_collect_glyphs' mangled-name='hb_ot_layout_lookup_collect_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_collect_glyphs'>
       <parameter type-id='type-id-144' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
       <parameter type-id='type-id-223' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='636' column='1'/>
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='637' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_input' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='639' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_after' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='640' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs_output' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='641' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_substitute_closure' mangled-name='hb_ot_layout_lookup_substitute_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_substitute_closure'>
       <parameter type-id='type-id-144' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
       <parameter type-id='type-id-12' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='719' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='720' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_glyph_class' mangled-name='hb_ot_layout_get_glyph_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_glyph_class'>
@@ -16967,7 +16967,7 @@
     <pointer-type-def type-id='type-id-2344' size-in-bits='64' id='type-id-1404'/>
     <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-2311'/>
     <function-type size-in-bits='64' id='type-id-1878'>
-      <parameter type-id='type-id-875'/>
+      <parameter type-id='type-id-804'/>
       <parameter type-id='type-id-2212'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-1'/>
@@ -16979,19 +16979,19 @@
       <return type-id='type-id-1'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1106'>
-      <parameter type-id='type-id-896'/>
+      <parameter type-id='type-id-826'/>
       <parameter type-id='type-id-12'/>
-      <return type-id='type-id-897'/>
+      <return type-id='type-id-827'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1107'>
-      <parameter type-id='type-id-894'/>
+      <parameter type-id='type-id-824'/>
       <parameter type-id='type-id-12'/>
-      <return type-id='type-id-895'/>
+      <return type-id='type-id-825'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1108'>
-      <parameter type-id='type-id-892'/>
+      <parameter type-id='type-id-822'/>
       <parameter type-id='type-id-12'/>
-      <return type-id='type-id-893'/>
+      <return type-id='type-id-823'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-2301'>
       <parameter type-id='type-id-1395'/>
@@ -17000,7 +17000,7 @@
       <return type-id='type-id-13'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-2302'>
-      <parameter type-id='type-id-875'/>
+      <parameter type-id='type-id-804'/>
       <parameter type-id='type-id-2212'/>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-13'/>
@@ -17511,7 +17511,7 @@
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <parameter type-id='type-id-177' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
       <parameter type-id='type-id-223' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='741' column='1'/>
-      <parameter type-id='type-id-875' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
+      <parameter type-id='type-id-804' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='742' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_ot_shape_glyphs_closure' mangled-name='hb_ot_shape_glyphs_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_glyphs_closure'>
@@ -17519,7 +17519,7 @@
       <parameter type-id='type-id-161' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <parameter type-id='type-id-402' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <parameter type-id='type-id-12' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='773' column='1'/>
-      <parameter type-id='type-id-875' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
+      <parameter type-id='type-id-804' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-2354'>
@@ -17573,12 +17573,12 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1072' size-in-bits='65536' id='type-id-1073'>
-      <subrange length='2048' type-id='type-id-4' id='type-id-1099'/>
+    <array-type-def dimensions='1' type-id='type-id-1067' size-in-bits='65536' id='type-id-1068'>
+      <subrange length='2048' type-id='type-id-4' id='type-id-1105'/>
     </array-type-def>
-    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-929'>
+    <class-decl name='hb_set_t' size-in-bits='66496' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='147' column='1' id='type-id-997'>
       <member-type access='public'>
-        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1072'/>
+        <typedef-decl name='elt_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1067'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-15' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='148' column='1'/>
@@ -17605,18 +17605,18 @@
         <var-decl name='INVALID' type-id='type-id-151' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='elts' type-id='type-id-1073' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
+        <var-decl name='elts' type-id='type-id-1068' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hb_set_t' type-id='type-id-929' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1071'/>
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-2437'/>
+    <typedef-decl name='hb_set_t' type-id='type-id-997' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.h' line='41' column='1' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-2437'/>
     <pointer-type-def type-id='type-id-2437' size-in-bits='64' id='type-id-2438'/>
     <qualified-type-def type-id='type-id-2438' const='yes' id='type-id-2439'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-875'/>
-    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-2440'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-2441'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-804'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-2440'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-2441'/>
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
-      <return type-id='type-id-875'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <function-decl name='hb_set_allocation_successful' mangled-name='hb_set_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_allocation_successful'>
       <parameter type-id='type-id-2438' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='153' column='1'/>
@@ -17645,53 +17645,53 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='hb_set_invert' mangled-name='hb_set_invert' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_invert'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_symmetric_difference' mangled-name='hb_set_symmetric_difference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_symmetric_difference'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_subtract' mangled-name='hb_set_subtract' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_subtract'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_intersect' mangled-name='hb_set_intersect' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_intersect'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_union' mangled-name='hb_set_union' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_union'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_set' mangled-name='hb_set_set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='366' column='1'/>
       <parameter type-id='type-id-2438' name='other' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='367' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_del_range' mangled-name='hb_set_del_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del_range'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <parameter type-id='type-id-72' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <parameter type-id='type-id-72' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_del' mangled-name='hb_set_del' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_del'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_add_range' mangled-name='hb_set_add_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add_range'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='267' column='1'/>
       <parameter type-id='type-id-72' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='268' column='1'/>
       <parameter type-id='type-id-72' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_add' mangled-name='hb_set_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_add'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='250' column='1'/>
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
@@ -17700,16 +17700,16 @@
       <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='hb_set_clear' mangled-name='hb_set_clear' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_clear'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_get_user_data' mangled-name='hb_set_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_user_data'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='135' column='1'/>
       <parameter type-id='type-id-37' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='136' column='1'/>
       <return type-id='type-id-33'/>
     </function-decl>
     <function-decl name='hb_set_set_user_data' mangled-name='hb_set_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_set_user_data'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='116' column='1'/>
       <parameter type-id='type-id-37' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='117' column='1'/>
       <parameter type-id='type-id-33' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='118' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='119' column='1'/>
@@ -17717,15 +17717,15 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='hb_set_reference' mangled-name='hb_set_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_reference'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
-      <return type-id='type-id-875'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='82' column='1'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <function-decl name='hb_set_destroy' mangled-name='hb_set_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_destroy'>
-      <parameter type-id='type-id-875' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
+      <parameter type-id='type-id-804' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='381' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='hb_set_create' mangled-name='hb_set_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_create'>
-      <return type-id='type-id-875'/>
+      <return type-id='type-id-804'/>
     </function-decl>
     <function-decl name='hb_set_next_range' mangled-name='hb_set_next_range' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next_range'>
       <parameter type-id='type-id-2438' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index f7a467a9..6eab0e79 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -3302,40 +3302,52 @@
       <return type-id='type-id-38'/>
     </function-decl>
     <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-57'/>
+    <namespace-decl name='std'>
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-320'/>
+      </class-decl>
+    </namespace-decl>
+    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-242'/>
     <class-decl name='vtkDataArray' visibility='default' is-declaration-only='yes' id='type-id-247'/>
     <class-decl name='vtkDataSet' visibility='default' is-declaration-only='yes' id='type-id-255'/>
     <class-decl name='vtkImageAlgorithm' visibility='default' is-declaration-only='yes' id='type-id-100'/>
     <class-decl name='vtkImageData' visibility='default' is-declaration-only='yes' id='type-id-258'/>
     <class-decl name='vtkImageNoiseSource' visibility='default' is-declaration-only='yes' id='type-id-260'/>
+    <class-decl name='vtkInformation' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-261'/>
     <class-decl name='vtkInformationVector' visibility='default' is-declaration-only='yes' id='type-id-262'/>
     <class-decl name='vtkOpenGLRenderWindow' visibility='default' is-declaration-only='yes' id='type-id-264'/>
     <class-decl name='vtkPointData' visibility='default' is-declaration-only='yes' id='type-id-275'/>
+    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
+    <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-279'/>
     <class-decl name='vtkShaderProgram2' visibility='default' is-declaration-only='yes' id='type-id-281'/>
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-62'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-74'/>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-66'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='protected'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-66'/>
           <parameter type-id='type-id-78'/>
           <return type-id='type-id-27'/>
@@ -3344,8 +3356,8 @@
     </class-decl>
     <qualified-type-def type-id='type-id-150' const='yes' id='type-id-305'/>
     <qualified-type-def type-id='type-id-182' id='type-id-309'/>
-    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-64'/>
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-67'/>
+    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-64'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-67'/>
     <function-type size-in-bits='64' id='type-id-205'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
@@ -3355,61 +3367,49 @@
       <return type-id='type-id-27'/>
     </function-type>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
-      <subrange length='6' type-id='type-id-4' id='type-id-322'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-323'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-311'/>
-    <namespace-decl name='std'>
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-323'/>
-      </class-decl>
-    </namespace-decl>
-    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-242'/>
-    <class-decl name='vtkInformation' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-261'/>
-    <class-decl name='vtkProgressObserver' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
-    <class-decl name='vtkRenderWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-279'/>
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-316'/>
     <qualified-type-def type-id='type-id-63' const='yes' id='type-id-65'/>
     <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-321'/>
     <namespace-decl name='std'>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-323'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-320'/>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-322'/>
     <typedef-decl name='GLfloat' type-id='type-id-16' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/mesa@8.0.5-22dd4c4b/include/GL/gl.h' line='160' column='1' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-321'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='192' id='type-id-60'>
-      <subrange length='6' type-id='type-id-4' id='type-id-322'/>
+      <subrange length='6' type-id='type-id-4' id='type-id-323'/>
     </array-type-def>
     <class-decl name='vtkWeakPointer&lt;vtkImageDataLIC2D&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='47' column='1' id='type-id-62'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-74'/>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-66'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-77'/>
           <return type-id='type-id-27'/>
         </function-decl>
       </member-function>
       <member-function access='protected'>
         <function-decl name='vtkWeakPointer' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkWeakPointer.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-320' is-artificial='yes'/>
+          <parameter type-id='type-id-321' is-artificial='yes'/>
           <parameter type-id='type-id-66'/>
           <parameter type-id='type-id-78'/>
           <return type-id='type-id-27'/>
@@ -3420,9 +3420,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
     <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-327'/>
     <qualified-type-def type-id='type-id-327' const='yes' id='type-id-328'/>
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-321'/>
-    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-64'/>
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-67'/>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-322'/>
+    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-64'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-67'/>
     <qualified-type-def type-id='type-id-62' const='yes' id='type-id-329'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
     <qualified-type-def type-id='type-id-330' const='yes' id='type-id-331'/>
@@ -3430,8 +3430,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-99' size-in-bits='64' id='type-id-334'/>
     <qualified-type-def type-id='type-id-63' const='yes' id='type-id-65'/>
     <reference-type-def kind='lvalue' type-id='type-id-62' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-320'/>
-    <qualified-type-def type-id='type-id-320' const='yes' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-321'/>
+    <qualified-type-def type-id='type-id-321' const='yes' id='type-id-336'/>
     <namespace-decl name='std'>
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-324'>
         <member-type access='private'>
@@ -4346,7 +4346,7 @@
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='86' column='1' id='type-id-473'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-308'/>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-323'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-320'/>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-410'>
         <member-type access='private'>
           <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-474'>
@@ -4738,7 +4738,7 @@
         </member-function>
       </class-decl>
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-308'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-323'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-320'/>
       </class-decl>
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-307'/>
       <class-decl name='vector&lt;vtkPixelBufferObject*, std::allocator&lt;vtkPixelBufferObject*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-426'>
@@ -7346,9 +7346,16 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <class-decl name='vtkActor' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-601'/>
     <class-decl name='vtkClipPlanesPainter' visibility='default' is-declaration-only='yes' id='type-id-602'/>
     <class-decl name='vtkCoincidentTopologyResolutionPainter' visibility='default' is-declaration-only='yes' id='type-id-604'/>
+    <class-decl name='vtkCompositePainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-606'/>
+    <class-decl name='vtkDisplayListPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-609'/>
     <class-decl name='vtkGarbageCollector' visibility='default' is-declaration-only='yes' id='type-id-611'/>
+    <class-decl name='vtkLightingPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-612'/>
+    <class-decl name='vtkRenderer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-615'/>
+    <class-decl name='vtkRepresentationPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-616'/>
+    <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-618'/>
     <class-decl name='vtkSmartPointer&lt;vtkBackgroundColorMonitor&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Common/Core/vtkSmartPointer.h' line='27' column='1' id='type-id-579'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-624'/>
       <member-function access='private'>
@@ -7626,13 +7633,6 @@
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='192' id='type-id-590'>
       <subrange length='3' type-id='type-id-4' id='type-id-642'/>
     </array-type-def>
-    <class-decl name='vtkActor' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-601'/>
-    <class-decl name='vtkCompositePainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-606'/>
-    <class-decl name='vtkDisplayListPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-609'/>
-    <class-decl name='vtkLightingPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-612'/>
-    <class-decl name='vtkRenderer' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-615'/>
-    <class-decl name='vtkRepresentationPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-616'/>
-    <class-decl name='vtkScalarsToColorsPainter' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-618'/>
     <array-type-def dimensions='1' type-id='type-id-643' size-in-bits='512' id='type-id-577'>
       <subrange length='8' type-id='type-id-4' id='type-id-644'/>
     </array-type-def>
@@ -7706,9 +7706,9 @@
         </function-decl>
       </member-function>
     </class-decl>
+    <class-decl name='vtkWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
     <reference-type-def kind='lvalue' type-id='type-id-651' size-in-bits='64' id='type-id-627'/>
     <qualified-type-def type-id='type-id-572' const='yes' id='type-id-641'/>
-    <class-decl name='vtkWindow' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-645'/>
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-626'/>
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-629'/>
     <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-633'/>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 6a31ea43..51f884ea 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1300,7 +1300,6 @@
     </namespace-decl>
     <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-83'/>
     <typedef-decl name='intptr_t' type-id='type-id-85' filepath='/usr/include/stdint.h' line='120' column='1' id='type-id-82'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-85'/>
     <class-decl name='LowLevelAlloc' size-in-bits='8' visibility='default' filepath='src/base/low_level_alloc.h' line='44' column='1' id='type-id-86'>
       <member-type access='private'>
         <class-decl name='Arena' size-in-bits='2560' is-struct='yes' visibility='default' filepath='src/base/low_level_alloc.cc' line='184' column='1' id='type-id-84'>
@@ -1341,6 +1340,7 @@
         </class-decl>
       </member-type>
     </class-decl>
+    <type-decl name='long int' size-in-bits='64' id='type-id-85'/>
     <class-decl name='SpinLock' size-in-bits='32' visibility='default' filepath='./src/base/spinlock.h' line='48' column='1' id='type-id-87'>
       <member-type access='private'>
         <enum-decl name='__anonymous_enum__2' is-anonymous='yes' filepath='./src/base/spinlock.h' line='116' column='1' id='type-id-88'>
@@ -1780,7 +1780,6 @@
         <return type-id='type-id-60'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-144'/>
     <namespace-decl name='tcmalloc'>
       <class-decl name='Span' size-in-bits='384' is-struct='yes' visibility='default' filepath='src/span.h' line='45' column='1' id='type-id-148'>
         <member-type access='public'>
@@ -1820,6 +1819,7 @@
         </data-member>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-144'/>
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-151'/>
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-155'/>
     <typedef-decl name='Length' type-id='type-id-156' filepath='src/common.h' line='59' column='1' id='type-id-154'/>
@@ -6079,125 +6079,11 @@
     <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='384' id='type-id-188'>
       <subrange length='48' type-id='type-id-5' id='type-id-928'/>
     </array-type-def>
-    <namespace-decl name='std'>
-      <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
-        <member-type access='private'>
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-929'/>
-        </member-type>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <parameter type-id='type-id-932'/>
-            <parameter type-id='type-id-933'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-935' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <parameter type-id='type-id-938'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <parameter type-id='type-id-939'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-419' id='type-id-247'/>
-    <qualified-type-def type-id='type-id-423' id='type-id-249'/>
-    <qualified-type-def type-id='type-id-273' id='type-id-250'/>
-    <qualified-type-def type-id='type-id-433' id='type-id-202'/>
-    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
-    <reference-type-def kind='lvalue' type-id='type-id-940' size-in-bits='64' id='type-id-490'/>
-    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-617'/>
-    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-632'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-634'/>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-259'/>
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-708'/>
-    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
-    <function-type size-in-bits='64' id='type-id-836'>
-      <parameter type-id='type-id-419'/>
-      <return type-id='type-id-62'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-848'>
-      <parameter type-id='type-id-415'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-849'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-228'/>
-      <parameter type-id='type-id-237'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-850'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-417'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-851'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-208'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-853'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-207'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-855'>
-      <parameter type-id='type-id-62'/>
-      <return type-id='type-id-58'/>
-    </function-type>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-868'/>
-    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-869'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-792'/>
     <namespace-decl name='std'>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-917'>
         <member-type access='private'>
           <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-636'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
             <data-member access='public' static='yes'>
               <var-decl name='_S_max_size' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='51' column='1'/>
             </data-member>
@@ -6210,14 +6096,14 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-944'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-930'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-931'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_p' type-id='type-id-118' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='262' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-946' is-artificial='yes'/>
+                <parameter type-id='type-id-932' is-artificial='yes'/>
                 <parameter type-id='type-id-118'/>
                 <parameter type-id='type-id-617'/>
                 <return type-id='type-id-60'/>
@@ -6226,7 +6112,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-943'>
+          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-929'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_length' type-id='type-id-62' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='142' column='1'/>
             </data-member>
@@ -6242,7 +6128,7 @@
           <var-decl name='npos' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='270' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_dataplus' type-id='type-id-944' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6318,6 +6204,120 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
+        <member-type access='private'>
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-933'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='_M_t' type-id='type-id-934' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-937'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <parameter type-id='type-id-938'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='_M_t' type-id='type-id-939' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <parameter type-id='type-id-941'/>
+            <parameter type-id='type-id-942'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <parameter type-id='type-id-943'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <qualified-type-def type-id='type-id-419' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-423' id='type-id-249'/>
+    <qualified-type-def type-id='type-id-273' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-433' id='type-id-202'/>
+    <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
+    <reference-type-def kind='lvalue' type-id='type-id-944' size-in-bits='64' id='type-id-490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-617'/>
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-634'/>
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-259'/>
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-708'/>
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
+    <function-type size-in-bits='64' id='type-id-836'>
+      <parameter type-id='type-id-419'/>
+      <return type-id='type-id-62'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-848'>
+      <parameter type-id='type-id-415'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-849'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-228'/>
+      <parameter type-id='type-id-237'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-850'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-417'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-851'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-208'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-853'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-207'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-855'>
+      <parameter type-id='type-id-62'/>
+      <return type-id='type-id-58'/>
+    </function-type>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-868'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-869'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-792'/>
     <typedef-decl name='AtomicWord' type-id='type-id-82' filepath='./src/base/atomicops.h' line='129' column='1' id='type-id-922'/>
     <typedef-decl name='__off_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-301'/>
     <typedef-decl name='pthread_t' type-id='type-id-5' filepath='/usr/include/bits/pthreadtypes.h' line='50' column='1' id='type-id-195'/>
@@ -6568,7 +6568,7 @@
       </member-function>
     </class-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-930'>
+      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-934'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-968'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-969'/>
@@ -6590,7 +6590,7 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-971' is-artificial='yes'/>
-                <parameter type-id='type-id-932'/>
+                <parameter type-id='type-id-936'/>
                 <parameter type-id='type-id-972'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -6609,8 +6609,8 @@
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-973' is-artificial='yes'/>
-            <parameter type-id='type-id-932'/>
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-937'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -6662,7 +6662,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-935'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-939'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-981'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-982'/>
@@ -6684,7 +6684,7 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-983' is-artificial='yes'/>
-                <parameter type-id='type-id-937'/>
+                <parameter type-id='type-id-941'/>
                 <parameter type-id='type-id-984'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -6703,8 +6703,8 @@
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-985' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-941'/>
+            <parameter type-id='type-id-942'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -6741,7 +6741,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-945'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-931'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6765,18 +6765,18 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-937'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-938'/>
-    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-940'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-941'/>
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-933'/>
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-942'/>
-    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-932'/>
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-934'/>
-    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-939'/>
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-936'/>
+    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-941'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-942'/>
+    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-944'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-945'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-937'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-936'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-938'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-940'/>
     <typedef-decl name='__ssize_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-947'/>
     <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-965'/>
     <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-964'/>
@@ -6827,52 +6827,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1001'/>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <parameter type-id='type-id-972'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
-            <parameter type-id='type-id-1' is-artificial='yes'/>
-            <return type-id='type-id-60'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
-    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-984'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-974'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-986'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-972'/>
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-992'/>
-    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
-    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
-    <qualified-type-def type-id='type-id-1009' id='type-id-977'/>
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-973'/>
-    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-971'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-985'/>
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-976'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-989'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-967'/>
     <namespace-decl name='std'>
       <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='224' column='1' id='type-id-980'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -6880,21 +6834,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
+            <parameter type-id='type-id-1003'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -6907,22 +6861,47 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <parameter type-id='type-id-976'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <parameter type-id='type-id-972'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
+            <parameter type-id='type-id-1' is-artificial='yes'/>
+            <return type-id='type-id-60'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='less&lt;HeapProfileTable::Bucket*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-970'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1007'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
@@ -6935,23 +6914,44 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
+            <parameter type-id='type-id-1003'/>
             <parameter type-id='type-id-488'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-991'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-984'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-992'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
+    <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
+    <qualified-type-def type-id='type-id-1015' id='type-id-977'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-973'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-971'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-985'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
+    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-967'/>
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-998'/>
     <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-999'/>
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1003'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1009'>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1018' is-artificial='yes'/>
@@ -6961,7 +6961,7 @@
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-938'/>
+          <parameter type-id='type-id-942'/>
           <return type-id='type-id-60'/>
         </function-decl>
       </member-function>
@@ -7005,7 +7005,7 @@
       </member-function>
     </class-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1001'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1005'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1019' is-artificial='yes'/>
@@ -7029,7 +7029,10 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1008'>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1016'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1014'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1021'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7040,7 +7043,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1022' is-artificial='yes'/>
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7061,7 +7064,10 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1011'>
+      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1007'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1017'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7109,27 +7115,21 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1004'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1010'/>
     <reference-type-def kind='lvalue' type-id='type-id-1030' size-in-bits='64' id='type-id-1000'/>
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1005'/>
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1006'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1014'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1013'/>
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1007'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1009'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1012'/>
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1015'/>
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1002'/>
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1017'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1010'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1016'/>
-    </namespace-decl>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1011'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1012'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1003'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1002'/>
+    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1008'/>
     <typedef-decl name='MallocExtensionWriter' type-id='type-id-924' filepath='./src/gperftools/malloc_extension.h' line='68' column='1' id='type-id-996'/>
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1018'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1019'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__normal_iterator&lt;MallocExtension::FreeListInfo*, std::vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-1028'>
         <data-member access='protected' layout-offset-in-bits='0'>
@@ -7174,22 +7174,11 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1025'/>
-    <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
-    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-1030'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1020'/>
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1032'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1024'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1033'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1026'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1022'/>
-    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <namespace-decl name='std'>
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1023'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1044'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1039'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-1034' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -7201,13 +7190,13 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <parameter type-id='type-id-1024'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -7215,24 +7204,24 @@
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1044' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1039' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-1024'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-1024'/>
             <return type-id='type-id-60'/>
@@ -7240,19 +7229,30 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1025'/>
+    <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
+    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-1030'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-1020'/>
+    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1032'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1024'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1033'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1026'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1022'/>
+    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-1034'/>
     <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1036'/>
     <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1035'/>
     <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1037'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1045'>
+      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1040'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7276,39 +7276,39 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1039'/>
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1040'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1038'/>
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1041'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1043'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1047'/>
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1046'/>
     <namespace-decl name='std'>
-      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1042'>
+      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1046'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1052' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1051' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-218' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='73' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
             <parameter type-id='type-id-1054'/>
-            <parameter type-id='type-id-1055'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1052'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1044'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1038'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1045'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1047'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1042'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
     <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1048'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1049'>
@@ -7334,10 +7334,10 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1055'/>
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1051'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1050'/>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1053'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1052'/>
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1056'/>
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-1058'/>
     <reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1057'/>
@@ -7347,15 +7347,15 @@
     <qualified-type-def type-id='type-id-265' const='yes' id='type-id-275'/>
     <qualified-type-def type-id='type-id-245' const='yes' id='type-id-248'/>
     <qualified-type-def type-id='type-id-228' const='yes' id='type-id-1060'/>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1052'/>
-    <qualified-type-def type-id='type-id-1054' id='type-id-1061'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1054'/>
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1062'/>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-1051'/>
+    <qualified-type-def type-id='type-id-1053' id='type-id-1061'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1062'/>
     <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-1063'/>
     <qualified-type-def type-id='type-id-224' const='yes' id='type-id-229'/>
     <reference-type-def kind='lvalue' type-id='type-id-218' size-in-bits='64' id='type-id-1064'/>
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1019'/>
     <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1065'/>
     <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1037'/>
     <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1066'/>
@@ -7368,20 +7368,20 @@
     <qualified-type-def type-id='type-id-423' id='type-id-249'/>
     <qualified-type-def type-id='type-id-273' id='type-id-250'/>
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-1058'/>
-    <qualified-type-def type-id='type-id-1055' id='type-id-1072'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1055'/>
+    <qualified-type-def type-id='type-id-1054' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-1054'/>
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1073'/>
     <qualified-type-def type-id='type-id-1073' const='yes' id='type-id-1074'/>
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1040'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1020'/>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1075'/>
+    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1044'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-1020'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1075'/>
     <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1051'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1077'/>
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1005'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-974'/>
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1078'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1055'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1038'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1077'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1011'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-974'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1078'/>
     <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1079'/>
     <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1080'/>
     <qualified-type-def type-id='type-id-1081' id='type-id-1082'/>
@@ -7389,55 +7389,55 @@
     <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1083'/>
     <qualified-type-def type-id='type-id-1083' const='yes' id='type-id-1084'/>
     <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1031'/>
-    <qualified-type-def type-id='type-id-1014' id='type-id-1085'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-1003' id='type-id-1085'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1031' size-in-bits='64' id='type-id-1003'/>
     <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-1086'/>
     <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1032'/>
     <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1002'/>
     <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1090'/>
     <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
     <qualified-type-def type-id='type-id-1091' const='yes' id='type-id-1092'/>
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1007'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-972'/>
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-992'/>
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-1013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-937'/>
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-993'/>
-    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-936'/>
     <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1093'/>
     <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1094'/>
     <qualified-type-def type-id='type-id-222' const='yes' id='type-id-994'/>
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-938'/>
     <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-1095'/>
     <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1096'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1033'/>
-    <qualified-type-def type-id='type-id-1009' id='type-id-977'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1009'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-1015' id='type-id-977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1033' size-in-bits='64' id='type-id-1015'/>
     <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1097'/>
-    <reference-type-def kind='lvalue' type-id='type-id-930' size-in-bits='64' id='type-id-1098'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-973'/>
+    <reference-type-def kind='lvalue' type-id='type-id-934' size-in-bits='64' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-973'/>
     <qualified-type-def type-id='type-id-973' const='yes' id='type-id-975'/>
     <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-971'/>
     <qualified-type-def type-id='type-id-971' const='yes' id='type-id-1099'/>
     <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1101'/>
     <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1012'/>
-    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1001'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1103'/>
     <reference-type-def kind='lvalue' type-id='type-id-978' size-in-bits='64' id='type-id-1104'/>
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1015'/>
-    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1105'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1106'/>
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-976'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1004'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1105'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-976'/>
     <reference-type-def kind='lvalue' type-id='type-id-969' size-in-bits='64' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1002'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1022'/>
     <reference-type-def kind='lvalue' type-id='type-id-222' size-in-bits='64' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-931'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1109'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-1110'/>
-    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1053'/>
-    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-935'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1109'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1052'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1008'/>
     <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-199'/>
     <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-269'/>
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-270'/>
@@ -7466,33 +7466,33 @@
       <class-decl name='__niter_base&lt;const void**, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-1112'/>
       <class-decl name='__niter_base&lt;const void* const*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-1113'/>
       <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-969'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1001'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <parameter type-id='type-id-972'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1002' is-artificial='yes'/>
+            <parameter type-id='type-id-1006' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='less&lt;HeapProfileTable::Bucket*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-970'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1007'/>
       </class-decl>
-      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1016'/>
-      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-930'>
+      <class-decl name='binary_function&lt;HeapProfileTable::Bucket*, HeapProfileTable::Bucket*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1007'/>
+      <class-decl name='_Rb_tree&lt;HeapProfileTable::Bucket*, std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, std::_Select1st&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-934'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;HeapProfileTable::Bucket*&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-968'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-969'/>
@@ -7514,7 +7514,7 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-971' is-artificial='yes'/>
-                <parameter type-id='type-id-932'/>
+                <parameter type-id='type-id-936'/>
                 <parameter type-id='type-id-972'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -7533,8 +7533,8 @@
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-973' is-artificial='yes'/>
-            <parameter type-id='type-id-932'/>
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-937'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7584,7 +7584,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1008'>
+      <class-decl name='allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1014'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1021'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7595,7 +7595,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1022' is-artificial='yes'/>
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-937'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7621,36 +7621,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
+            <parameter type-id='type-id-1004' is-artificial='yes'/>
             <parameter type-id='type-id-976'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1042'>
+      <class-decl name='pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-1046'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1052' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
+          <var-decl name='first' type-id='type-id-1051' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-218' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='73' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1053' is-artificial='yes'/>
+            <parameter type-id='type-id-1052' is-artificial='yes'/>
+            <parameter type-id='type-id-1053'/>
             <parameter type-id='type-id-1054'/>
-            <parameter type-id='type-id-1055'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7661,29 +7661,29 @@
       <class-decl name='unary_function&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt;, HeapProfileTable::Bucket* const&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-1115'/>
       <class-decl name='map&lt;HeapProfileTable::Bucket*, HeapProfileTable::Snapshot::Entry, std::less&lt;HeapProfileTable::Bucket*&gt;, std::allocator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='87' column='1' id='type-id-222'>
         <member-type access='private'>
-          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-929'/>
+          <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-933'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-934' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='128' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <parameter type-id='type-id-932'/>
-            <parameter type-id='type-id-933'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <parameter type-id='type-id-936'/>
+            <parameter type-id='type-id-937'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-931' is-artificial='yes'/>
-            <parameter type-id='type-id-934'/>
+            <parameter type-id='type-id-935' is-artificial='yes'/>
+            <parameter type-id='type-id-938'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7715,14 +7715,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1017' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1008' is-artificial='yes'/>
+            <parameter type-id='type-id-1003'/>
             <parameter type-id='type-id-488'/>
             <return type-id='type-id-60'/>
           </function-decl>
@@ -7734,21 +7734,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1012' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
+            <parameter type-id='type-id-1001' is-artificial='yes'/>
+            <parameter type-id='type-id-1003'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -7827,11 +7827,11 @@
         <return type-id='type-id-60'/>
       </function-decl>
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1054'/>
-        <parameter type-id='type-id-1054'/>
-        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1053'/>
+        <parameter type-id='type-id-1053'/>
+        <parameter type-id='type-id-1053'/>
         <parameter type-id='type-id-1068'/>
-        <return type-id='type-id-1054'/>
+        <return type-id='type-id-1053'/>
       </function-decl>
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-243'/>
@@ -7870,10 +7870,10 @@
         <return type-id='type-id-60'/>
       </function-decl>
       <function-decl name='__median&lt;HeapProfileTable::Snapshot::Entry&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1055'/>
-        <parameter type-id='type-id-1055'/>
-        <parameter type-id='type-id-1055'/>
-        <return type-id='type-id-1055'/>
+        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1054'/>
+        <parameter type-id='type-id-1054'/>
+        <return type-id='type-id-1054'/>
       </function-decl>
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Snapshot::Entry*, HeapProfileTable::Snapshot::Entry&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2204' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-220'/>
@@ -7989,7 +7989,7 @@
         <parameter type-id='type-id-220'/>
         <return type-id='type-id-60'/>
       </function-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1010'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1016'/>
       <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1121'/>
       <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-1122'/>
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1123'/>
@@ -8042,7 +8042,7 @@
       </function-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1001'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1005'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1019' is-artificial='yes'/>
@@ -8202,13 +8202,13 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1130'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1129'/>
     <namespace-decl name='std'>
       <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1128'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1135'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1133'/>
       </class-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1129'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-1131'>
         <member-function access='private'>
@@ -8233,12 +8233,12 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1133'/>
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1134'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1132'/>
     <namespace-decl name='std'>
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1135'/>
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1133'/>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1134'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1135'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1132'/>
     <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-1136'/>
     <reference-type-def kind='lvalue' type-id='type-id-1138' size-in-bits='64' id='type-id-1137'/>
     <qualified-type-def type-id='type-id-1131' const='yes' id='type-id-1138'/>
@@ -8859,45 +8859,6 @@
     </function-decl>
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1180'/>
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-1187'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1225'/>
-    <function-type size-in-bits='64' id='type-id-1210'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-963'/>
-      <return type-id='type-id-1'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-207'/>
-      <parameter type-id='type-id-151'/>
-      <return type-id='type-id-1'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1214'>
-      <parameter type-id='type-id-208'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-207'/>
-      <return type-id='type-id-60'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1218'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-60'/>
-    </function-type>
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
         <class-decl name='HookList&lt;void (*)(const void*)&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='./src/malloc_hook-inl.h' line='59' column='1' id='type-id-1223'>
@@ -8921,13 +8882,13 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <return type-id='type-id-337'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <return type-id='type-id-61'/>
             </function-decl>
           </member-function>
@@ -8939,8 +8900,8 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
-              <parameter type-id='type-id-1229' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1228' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <parameter type-id='type-id-1' name='n' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <return type-id='type-id-1'/>
             </function-decl>
@@ -8969,6 +8930,45 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1225'/>
+    <function-type size-in-bits='64' id='type-id-1210'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-963'/>
+      <return type-id='type-id-1'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1212'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-207'/>
+      <parameter type-id='type-id-151'/>
+      <return type-id='type-id-1'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1214'>
+      <parameter type-id='type-id-208'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1216'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-207'/>
+      <return type-id='type-id-60'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1218'>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-62'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-58'/>
+      <return type-id='type-id-60'/>
+    </function-type>
     <typedef-decl name='__off64_t' type-id='type-id-85' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-1226'/>
     <namespace-decl name='base'>
       <namespace-decl name='subtle'>
@@ -8976,9 +8976,9 @@
       </namespace-decl>
     </namespace-decl>
     <qualified-type-def type-id='type-id-1224' volatile='yes' id='type-id-1220'/>
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1228'/>
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1227'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1229'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1227'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1228'/>
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1230'/>
     <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1231'/>
   </abi-instr>
@@ -9119,7 +9119,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1003'>
+    <class-decl name='STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt;' size-in-bits='8' visibility='default' filepath='src/base/stl_allocator.h' line='60' column='1' id='type-id-1009'>
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1018' is-artificial='yes'/>
@@ -9129,7 +9129,7 @@
       <member-function access='private'>
         <function-decl name='STL_Allocator' filepath='src/base/stl_allocator.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1018' is-artificial='yes'/>
-          <parameter type-id='type-id-938'/>
+          <parameter type-id='type-id-942'/>
           <return type-id='type-id-60'/>
         </function-decl>
       </member-function>
@@ -9153,42 +9153,42 @@
     <qualified-type-def type-id='type-id-204' const='yes' id='type-id-1240'/>
     <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-1241'/>
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1018'/>
     <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1242'/>
     <reference-type-def kind='lvalue' type-id='type-id-982' size-in-bits='64' id='type-id-1243'/>
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-998'/>
     <qualified-type-def type-id='type-id-998' const='yes' id='type-id-1244'/>
     <qualified-type-def type-id='type-id-433' id='type-id-202'/>
     <qualified-type-def type-id='type-id-182' const='yes' id='type-id-990'/>
-    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-937'/>
+    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-941'/>
     <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1245'/>
     <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1246'/>
-    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-938'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-991'/>
+    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-942'/>
     <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-1247'/>
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1004'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-984'/>
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1248'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1010'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-984'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1248'/>
     <qualified-type-def type-id='type-id-1249' const='yes' id='type-id-1250'/>
     <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1252'/>
     <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1253'/>
     <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1254'/>
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1006'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-986'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1255'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1012'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-986'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1255'/>
     <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1256'/>
     <qualified-type-def type-id='type-id-546' id='type-id-1257'/>
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1258'/>
     <qualified-type-def type-id='type-id-1258' const='yes' id='type-id-1259'/>
     <reference-type-def kind='lvalue' type-id='type-id-572' size-in-bits='64' id='type-id-1260'/>
     <qualified-type-def type-id='type-id-186' const='yes' id='type-id-995'/>
-    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-939'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-943'/>
     <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-1261'/>
     <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1262'/>
     <qualified-type-def type-id='type-id-93' const='yes' id='type-id-110'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-109'/>
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1263'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-985'/>
+    <reference-type-def kind='lvalue' type-id='type-id-939' size-in-bits='64' id='type-id-1263'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-985'/>
     <qualified-type-def type-id='type-id-985' const='yes' id='type-id-987'/>
     <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-983'/>
     <qualified-type-def type-id='type-id-983' const='yes' id='type-id-1264'/>
@@ -9200,37 +9200,37 @@
     <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-1269'/>
     <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
     <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-1272'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-936'/>
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1273'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-940'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1273'/>
     <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-201'/>
     <namespace-decl name='std'>
       <class-decl name='set&lt;MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='88' column='1' id='type-id-186'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-935' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-939' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='112' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <parameter type-id='type-id-941'/>
+            <parameter type-id='type-id-942'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-936' is-artificial='yes'/>
-            <parameter type-id='type-id-939'/>
+            <parameter type-id='type-id-940' is-artificial='yes'/>
+            <parameter type-id='type-id-943'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-935'>
+      <class-decl name='_Rb_tree&lt;MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity&lt;MemoryRegionMap::Region&gt;, MemoryRegionMap::RegionCmp, STL_Allocator&lt;MemoryRegionMap::Region, MemoryRegionMap::MyAllocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-939'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;MemoryRegionMap::RegionCmp, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-981'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-982'/>
@@ -9252,7 +9252,7 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-983' is-artificial='yes'/>
-                <parameter type-id='type-id-937'/>
+                <parameter type-id='type-id-941'/>
                 <parameter type-id='type-id-984'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -9271,8 +9271,8 @@
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-985' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <parameter type-id='type-id-938'/>
+            <parameter type-id='type-id-941'/>
+            <parameter type-id='type-id-942'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
@@ -10279,16 +10279,16 @@
     </class-decl>
     <qualified-type-def type-id='type-id-1404' const='yes' id='type-id-1395'/>
     <qualified-type-def type-id='type-id-1397' const='yes' id='type-id-1396'/>
-    <array-type-def dimensions='1' type-id='type-id-1404' size-in-bits='16896' id='type-id-1403'>
-      <subrange length='4' type-id='type-id-5' id='type-id-162'/>
-    </array-type-def>
     <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-1407'/>
     <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1408'/>
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1411'/>
     <array-type-def dimensions='1' type-id='type-id-1405' size-in-bits='4096' id='type-id-1406'>
       <subrange length='64' type-id='type-id-5' id='type-id-1412'/>
     </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-1404' size-in-bits='16896' id='type-id-1403'>
+      <subrange length='4' type-id='type-id-5' id='type-id-162'/>
+    </array-type-def>
+    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-1399' size-in-bits='64' id='type-id-1411'/>
     <array-type-def dimensions='1' type-id='type-id-65' size-in-bits='8192' id='type-id-1401'>
       <subrange length='1024' type-id='type-id-5' id='type-id-1413'/>
     </array-type-def>
@@ -11166,13 +11166,13 @@
     <qualified-type-def type-id='type-id-1497' const='yes' id='type-id-1498'/>
     <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
     <qualified-type-def type-id='type-id-1499' const='yes' id='type-id-1500'/>
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1133'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1130'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1134'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1130'/>
     <qualified-type-def type-id='type-id-1501' const='yes' id='type-id-1502'/>
     <reference-type-def kind='lvalue' type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
-    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1134'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1129'/>
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1504'/>
+    <qualified-type-def type-id='type-id-1128' const='yes' id='type-id-1135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1129'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1504'/>
     <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-1505'/>
     <qualified-type-def type-id='type-id-1464' const='yes' id='type-id-1506'/>
     <reference-type-def kind='lvalue' type-id='type-id-1506' size-in-bits='64' id='type-id-1507'/>
@@ -11205,9 +11205,9 @@
     <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
     <namespace-decl name='std'>
       <class-decl name='less&lt;const void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1128'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1135'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1133'/>
       </class-decl>
-      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1135'/>
+      <class-decl name='binary_function&lt;const void*, const void*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-1133'/>
       <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const void* const, const char*&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='154' column='1' id='type-id-1487'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-865' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='219' column='1'/>
@@ -12843,10 +12843,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-65' size-in-bits='64' id='type-id-1632'/>
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-118'/>
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-125'/>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1039'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1043'/>
     <qualified-type-def type-id='type-id-1025' id='type-id-1029'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1025'/>
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1633'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1025'/>
+    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1633'/>
     <qualified-type-def type-id='type-id-1595' const='yes' id='type-id-1634'/>
     <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-1635'/>
     <qualified-type-def type-id='type-id-1635' const='yes' id='type-id-1636'/>
@@ -12875,7 +12875,7 @@
     <qualified-type-def type-id='type-id-1650' const='yes' id='type-id-1651'/>
     <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1231'/>
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1230'/>
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1227'/>
     <qualified-type-def type-id='type-id-61' const='yes' id='type-id-487'/>
     <qualified-type-def type-id='type-id-65' const='yes' id='type-id-63'/>
     <reference-type-def kind='lvalue' type-id='type-id-63' size-in-bits='64' id='type-id-1652'/>
@@ -12886,27 +12886,27 @@
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-144'/>
     <qualified-type-def type-id='type-id-1599' const='yes' id='type-id-1654'/>
     <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
-    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-940'/>
-    <reference-type-def kind='lvalue' type-id='type-id-940' size-in-bits='64' id='type-id-490'/>
+    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-944'/>
+    <reference-type-def kind='lvalue' type-id='type-id-944' size-in-bits='64' id='type-id-490'/>
     <qualified-type-def type-id='type-id-62' const='yes' id='type-id-117'/>
     <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1656'/>
     <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1657'/>
     <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1658'/>
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1041'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1024'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-941'/>
-    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-617'/>
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-942'/>
-    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-632'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-634'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1045'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1024'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-945'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-617'/>
+    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-634'/>
     <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1660'/>
     <qualified-type-def type-id='type-id-1661' const='yes' id='type-id-1662'/>
     <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1664'/>
     <qualified-type-def type-id='type-id-1665' id='type-id-1666'/>
     <reference-type-def kind='lvalue' type-id='type-id-1664' size-in-bits='64' id='type-id-1665'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1043'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1026'/>
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1667'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1026'/>
+    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1667'/>
     <qualified-type-def type-id='type-id-1667' const='yes' id='type-id-1668'/>
     <qualified-type-def type-id='type-id-1669' const='yes' id='type-id-1670'/>
     <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
@@ -12929,8 +12929,8 @@
     <qualified-type-def type-id='type-id-156' const='yes' id='type-id-259'/>
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-708'/>
     <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-706'/>
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1227'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-1225'/>
+    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-1225'/>
     <qualified-type-def type-id='type-id-1582' const='yes' id='type-id-1691'/>
     <pointer-type-def type-id='type-id-1691' size-in-bits='64' id='type-id-1692'/>
     <pointer-type-def type-id='type-id-1692' size-in-bits='64' id='type-id-1693'/>
@@ -12939,21 +12939,21 @@
     <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-1695'/>
     <pointer-type-def type-id='type-id-1599' size-in-bits='64' id='type-id-1696'/>
     <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-253'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1047'/>
-    <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1697'/>
-    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-1046'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1050'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1042'/>
+    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1697'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1041'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-989'/>
     <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
     <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1701'/>
     <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-946'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-932'/>
     <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-1702'/>
     <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-792'/>
     <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1705'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-967'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-1705'/>
+    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-967'/>
     <qualified-type-def type-id='type-id-967' const='yes' id='type-id-1027'/>
     <pointer-type-def type-id='type-id-1706' size-in-bits='64' id='type-id-1707'/>
     <qualified-type-def type-id='type-id-1707' const='yes' id='type-id-1708'/>
@@ -12986,7 +12986,7 @@
     <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-234'/>
     <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-1733'/>
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1228'/>
     <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-58'/>
     <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-1737'/>
@@ -13002,7 +13002,7 @@
     <pointer-type-def type-id='type-id-1582' size-in-bits='64' id='type-id-1743'/>
     <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1744'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1045'>
+      <class-decl name='allocator&lt;MallocExtension::FreeListInfo&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-1040'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1049'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13043,8 +13043,8 @@
       </class-decl>
       <class-decl name='_Vector_base&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-1023'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1044'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1045'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-1039'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-1034' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -13056,13 +13056,13 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <return type-id='type-id-60'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1046' is-artificial='yes'/>
+                <parameter type-id='type-id-1041' is-artificial='yes'/>
                 <parameter type-id='type-id-1024'/>
                 <return type-id='type-id-60'/>
               </function-decl>
@@ -13070,24 +13070,24 @@
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1044' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1039' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-1024'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <parameter type-id='type-id-1024'/>
             <return type-id='type-id-60'/>
@@ -13095,13 +13095,13 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1047' is-artificial='yes'/>
+            <parameter type-id='type-id-1042' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-60'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1011'>
+      <class-decl name='vector&lt;MallocExtension::FreeListInfo, std::allocator&lt;MallocExtension::FreeListInfo&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-1017'>
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-1023'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13148,7 +13148,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-945'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='45' column='1' id='type-id-931'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13174,7 +13174,7 @@
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stringfwd.h' line='52' column='1' id='type-id-917'>
         <member-type access='private'>
           <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='148' column='1' id='type-id-636'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
             <data-member access='public' static='yes'>
               <var-decl name='_S_max_size' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='51' column='1'/>
             </data-member>
@@ -13187,14 +13187,14 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-944'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-930'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-931'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_p' type-id='type-id-118' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='262' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-946' is-artificial='yes'/>
+                <parameter type-id='type-id-932' is-artificial='yes'/>
                 <parameter type-id='type-id-118'/>
                 <parameter type-id='type-id-617'/>
                 <return type-id='type-id-60'/>
@@ -13203,7 +13203,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-943'>
+          <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='141' column='1' id='type-id-929'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_length' type-id='type-id-62' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='142' column='1'/>
             </data-member>
@@ -13219,7 +13219,7 @@
           <var-decl name='npos' type-id='type-id-117' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='270' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_dataplus' type-id='type-id-944' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-930' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14122,13 +14122,13 @@
           </data-member>
           <member-function access='public'>
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <return type-id='type-id-337'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv' filepath='src/malloc_hook-inl.h' line='80' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE5emptyEv'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
               <return type-id='type-id-61'/>
             </function-decl>
           </member-function>
@@ -14140,8 +14140,8 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
-              <parameter type-id='type-id-1228' name='this' is-artificial='yes'/>
-              <parameter type-id='type-id-1229' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
+              <parameter type-id='type-id-1227' name='this' is-artificial='yes'/>
+              <parameter type-id='type-id-1228' name='output_array' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <parameter type-id='type-id-1' name='n' filepath='src/malloc_hook-inl.h' line='77' column='1'/>
               <return type-id='type-id-1'/>
             </function-decl>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 9a00f6fe..78531066 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -4313,25 +4313,99 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-482'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <parameter type-id='type-id-89'/>
+            <parameter type-id='type-id-468'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <parameter type-id='type-id-508'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-472'>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
+        </data-member>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <parameter type-id='type-id-89'/>
+            <parameter type-id='type-id-468'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='public'>
+          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <parameter type-id='type-id-508'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='deque&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='639' column='1' id='type-id-57'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-507'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-510'/>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-251'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='710' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-290'/>
             <parameter type-id='type-id-251'/>
@@ -4340,41 +4414,41 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
+            <parameter type-id='type-id-512'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-482'/>
             <parameter type-id='type-id-482'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-482'/>
             <parameter type-id='type-id-482'/>
@@ -4383,7 +4457,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
@@ -4392,7 +4466,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reallocate_map' mangled-name='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <parameter type-id='type-id-1' name='__add_at_front' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <return type-id='type-id-29'/>
@@ -4400,35 +4474,35 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reserve_map_at_back' mangled-name='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1715' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_new_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_new_elements_at_back' mangled-name='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reserve_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1'/>
             <return type-id='type-id-472'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <parameter type-id='type-id-472' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
@@ -4438,17 +4512,17 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <parameter type-id='type-id-472' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <parameter type-id='type-id-291' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
@@ -4457,7 +4531,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <parameter type-id='type-id-482' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
@@ -4467,40 +4541,43 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <parameter type-id='type-id-482' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt5dequeIhSaIhEEaSERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEEaSERKS1_'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-513' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
-            <return type-id='type-id-514'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-516' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
+            <return type-id='type-id-517'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-402'/>
     <class-decl name='vtkCharArray' visibility='default' is-declaration-only='yes' id='type-id-406'/>
     <class-decl name='vtkDataArray' visibility='default' is-declaration-only='yes' id='type-id-408'/>
     <class-decl name='vtkDataObject' visibility='default' is-declaration-only='yes' id='type-id-300'/>
     <class-decl name='vtkDataSet' visibility='default' is-declaration-only='yes' id='type-id-413'/>
     <class-decl name='vtkDataWriter' visibility='default' is-declaration-only='yes' id='type-id-415'/>
+    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-418'/>
     <class-decl name='vtkGenericDataObjectReader' visibility='default' is-declaration-only='yes' id='type-id-420'/>
     <class-decl name='vtkGenericDataObjectWriter' visibility='default' is-declaration-only='yes' id='type-id-422'/>
     <class-decl name='vtkImageData' visibility='default' is-declaration-only='yes' id='type-id-424'/>
+    <class-decl name='vtkMultiBlockDataSet' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <class-decl name='vtkObject' visibility='default' is-declaration-only='yes' id='type-id-119'/>
     <class-decl name='vtkRectilinearGrid' visibility='default' is-declaration-only='yes' id='type-id-429'/>
     <class-decl name='vtkStructuredGrid' visibility='default' is-declaration-only='yes' id='type-id-437'/>
     <reference-type-def kind='lvalue' type-id='type-id-211' size-in-bits='64' id='type-id-474'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-479'/>
     <qualified-type-def type-id='type-id-276' id='type-id-82'/>
     <qualified-type-def type-id='type-id-284' id='type-id-87'/>
-    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-498'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-459'/>
     <qualified-type-def type-id='type-id-307' const='yes' id='type-id-64'/>
     <qualified-type-def type-id='type-id-331' id='type-id-79'/>
     <qualified-type-def type-id='type-id-332' id='type-id-69'/>
@@ -4524,83 +4601,6 @@
     </array-type-def>
     <qualified-type-def type-id='type-id-385' id='type-id-71'/>
     <qualified-type-def type-id='type-id-389' id='type-id-65'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-482'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <parameter type-id='type-id-89'/>
-            <parameter type-id='type-id-468'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='95' column='1' id='type-id-472'>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_cur' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='111' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_first' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='112' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_last' type-id='type-id-89' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='113' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_node' type-id='type-id-468' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='114' column='1'/>
-        </data-member>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <parameter type-id='type-id-89'/>
-            <parameter type-id='type-id-468'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='public'>
-          <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <class-decl name='vtkAbstractArray' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-402'/>
-    <class-decl name='vtkGarbageCollector' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-418'/>
-    <class-decl name='vtkMultiBlockDataSet' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <qualified-type-def type-id='type-id-393' id='type-id-70'/>
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-467'/>
     <qualified-type-def type-id='type-id-396' id='type-id-62'/>
@@ -4626,7 +4626,7 @@
     <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-503'/>
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-505'/>
     <namespace-decl name='std'>
-      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-507'>
+      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-510'>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-528'>
             <underlying-type type-id='type-id-25'/>
@@ -4703,16 +4703,24 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
+    <namespace-decl name='std'>
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-513'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-515'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      </class-decl>
+    </namespace-decl>
+    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-534'>
       <member-type access='private'>
-        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-534'>
+        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-535'>
           <member-type access='private'>
             <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-521'>
               <data-member access='private' layout-offset-in-bits='0'>
                 <var-decl name='Id' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='53' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='Function' type-id='type-id-535' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
+                <var-decl name='Function' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <var-decl name='LocalArgument' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='55' column='1'/>
@@ -4722,42 +4730,27 @@
         </class-decl>
       </member-type>
     </class-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-504'/>
-    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-515'/>
-    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-519'/>
-    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-509'/>
-    <qualified-type-def type-id='type-id-509' id='type-id-513'/>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-516'/>
-    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-506'/>
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-518'/>
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-508'/>
-    <qualified-type-def type-id='type-id-508' const='yes' id='type-id-511'/>
-    <namespace-decl name='std'>
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-510'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-512'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-540'/>
-      </class-decl>
-    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-518'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-508'/>
+    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-512'/>
+    <qualified-type-def type-id='type-id-512' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-519'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-520'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-511'/>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-514'/>
     <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-523'/>
     <qualified-type-def type-id='type-id-523' const='yes' id='type-id-522'/>
     <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-525'/>
     <qualified-type-def type-id='type-id-525' const='yes' id='type-id-524'/>
     <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-527'/>
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-526'/>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-536'/>
-    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-537'/>
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-538'/>
-    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-539'/>
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-531'/>
-    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
     <namespace-decl name='std'>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-540'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-533'/>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <class-decl name='_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-541'/>
@@ -4768,7 +4761,14 @@
     <namespace-decl name='vtksys'>
       <class-decl name='_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-543'/>
     </namespace-decl>
-    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-535'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-537'/>
+    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-538'/>
+    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-539'/>
+    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-540'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-531'/>
+    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
+    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-536'/>
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-544'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
@@ -4855,7 +4855,7 @@
     <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-533'>
+    <class-decl name='vtkMultiProcessController' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='63' column='1' id='type-id-534'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-119'/>
       <member-type access='public'>
         <enum-decl name='Errors' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='296' column='1' id='type-id-551'>
@@ -4882,14 +4882,14 @@
         </enum-decl>
       </member-type>
       <member-type access='private'>
-        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-534'>
+        <class-decl name='vtkInternal' size-in-bits='960' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='45' column='1' id='type-id-535'>
           <member-type access='private'>
             <class-decl name='vtkRMICallback' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='51' column='1' id='type-id-521'>
               <data-member access='private' layout-offset-in-bits='0'>
                 <var-decl name='Id' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='53' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='Function' type-id='type-id-535' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
+                <var-decl name='Function' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='54' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <var-decl name='LocalArgument' type-id='type-id-14' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='55' column='1'/>
@@ -5162,7 +5162,7 @@
       <member-function access='public' vtable-offset='29'>
         <function-decl name='AddRMI' mangled-name='_ZN25vtkMultiProcessController6AddRMIEPFvPvS0_iiES0_i' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN25vtkMultiProcessController6AddRMIEPFvPvS0_iiES0_i'>
           <parameter type-id='type-id-561' is-artificial='yes'/>
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-4'/>
@@ -5185,7 +5185,7 @@
       <member-function access='public' vtable-offset='32'>
         <function-decl name='RemoveRMI' mangled-name='_ZN25vtkMultiProcessController9RemoveRMIEPFvPvS0_iiES0_i' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-561' is-artificial='yes'/>
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-29'/>
@@ -5194,7 +5194,7 @@
       <member-function access='public' vtable-offset='33'>
         <function-decl name='AddRMICallback' mangled-name='_ZN25vtkMultiProcessController14AddRMICallbackEPFvPvS0_iiES0_i' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN25vtkMultiProcessController14AddRMICallbackEPFvPvS0_iiES0_i'>
           <parameter type-id='type-id-561' is-artificial='yes'/>
-          <parameter type-id='type-id-535'/>
+          <parameter type-id='type-id-536'/>
           <parameter type-id='type-id-14'/>
           <parameter type-id='type-id-19'/>
           <return type-id='type-id-4'/>
@@ -5251,9 +5251,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-535'/>
+    <typedef-decl name='vtkRMIFunctionType' type-id='type-id-544' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-536'/>
     <class-decl name='vtkDummyController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.h' line='30' column='1' id='type-id-570'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
       <member-function access='protected' constructor='yes'>
         <function-decl name='vtkDummyController' mangled-name='_ZN18vtkDummyControllerC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' line='25' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN18vtkDummyControllerC2Ev'>
           <parameter type-id='type-id-571' is-artificial='yes'/>
@@ -5388,7 +5388,7 @@
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-544'/>
     <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-571'/>
     <qualified-type-def type-id='type-id-571' const='yes' id='type-id-575'/>
-    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-561'/>
+    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-561'/>
     <namespace-decl name='vtksys'>
       <class-decl name='hash_map&lt;int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-555'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -5515,7 +5515,7 @@
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-588' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-558'/>
     <qualified-type-def type-id='type-id-589' id='type-id-566'/>
     <qualified-type-def type-id='type-id-561' const='yes' id='type-id-563'/>
-    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-560'/>
     <pointer-type-def type-id='type-id-590' size-in-bits='64' id='type-id-559'/>
     <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-564'/>
     <qualified-type-def type-id='type-id-592' id='type-id-565'/>
@@ -5907,7 +5907,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-583'/>
     <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-586'/>
     <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-579'/>
-    <qualified-type-def type-id='type-id-533' const='yes' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-587'/>
     <reference-type-def kind='lvalue' type-id='type-id-624' size-in-bits='64' id='type-id-578'/>
     <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-588'/>
     <reference-type-def kind='lvalue' type-id='type-id-14' size-in-bits='64' id='type-id-589'/>
@@ -6011,48 +6011,53 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-604'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-477'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-638'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
+            <parameter type-id='type-id-639'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-466'/>
             <parameter type-id='type-id-466'/>
@@ -6061,17 +6066,17 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm'>
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-640' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-641' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-641' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-642' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -6079,46 +6084,46 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-610'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-642'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-475'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-462'/>
             <parameter type-id='type-id-462'/>
@@ -6127,17 +6132,17 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm'>
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-647' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-648' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-648' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-649' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -6145,46 +6150,46 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-616'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-649'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-650'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-476'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
-            <parameter type-id='type-id-652'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-464'/>
             <parameter type-id='type-id-464'/>
@@ -6193,67 +6198,62 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm'>
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_'>
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-654' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-655' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-655' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-656' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-620'/>
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-621'/>
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-622'/>
-    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
-    <reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-594'/>
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-596'/>
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-599'/>
-    <qualified-type-def type-id='type-id-601' const='yes' id='type-id-624'/>
-    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-662' size-in-bits='64' id='type-id-612'/>
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-618'/>
-    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-607'/>
-    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-613'/>
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-619'/>
-    <namespace-decl name='std'>
-      <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
-      </class-decl>
-    </namespace-decl>
     <namespace-decl name='vtksys'>
       <class-decl name='hash&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_fun.hxx' line='106' column='1' id='type-id-601'/>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <class-decl name='hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-603'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-668'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-657'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <class-decl name='hash_select1st&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-609'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-669'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-658'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='vtksys'>
       <class-decl name='hash_select1st&lt;const int, void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-615'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-670'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-659'/>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-620'/>
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-621'/>
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-622'/>
+    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-594'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-596'/>
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-597'/>
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-599'/>
+    <qualified-type-def type-id='type-id-601' const='yes' id='type-id-624'/>
+    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-606'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-618'/>
+    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-619'/>
     <qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
     <qualified-type-def type-id='type-id-569' const='yes' id='type-id-598'/>
     <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-605'/>
     <pointer-type-def type-id='type-id-581' size-in-bits='64' id='type-id-611'/>
     <pointer-type-def type-id='type-id-584' size-in-bits='64' id='type-id-617'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-640'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-641'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -6273,7 +6273,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-647'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-648'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -6293,7 +6293,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-654'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-655'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -6385,111 +6385,10 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-683'/>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <parameter type-id='type-id-580'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-685'/>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
-            <parameter type-id='type-id-583'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
-            <parameter type-id='type-id-586'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
-            <parameter type-id='type-id-19' is-artificial='yes'/>
-            <return type-id='type-id-29'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-628'/>
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-631'/>
-    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-644'/>
-    <reference-type-def kind='lvalue' type-id='type-id-693' size-in-bits='64' id='type-id-634'/>
-    <reference-type-def kind='lvalue' type-id='type-id-694' size-in-bits='64' id='type-id-651'/>
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-645'/>
-    <reference-type-def kind='lvalue' type-id='type-id-697' size-in-bits='64' id='type-id-652'/>
-    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
-    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-661'/>
-    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-662'/>
-    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-663'/>
-    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-664'/>
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-665'/>
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
-    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-636'/>
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-639'/>
-    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-643'/>
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-650'/>
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-653'/>
-    <namespace-decl name='std'>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-635'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-636'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-698'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-683'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-684'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -6501,46 +6400,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-700' is-artificial='yes'/>
-                <parameter type-id='type-id-637'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-638'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-698' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-683' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -6548,10 +6447,10 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-642'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-643'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-702'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-703'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-687'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-688'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -6563,46 +6462,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-704' is-artificial='yes'/>
-                <parameter type-id='type-id-644'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
+                <parameter type-id='type-id-645'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-702' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-687' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -6610,10 +6509,10 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-649'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-650'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-706'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-691'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -6625,46 +6524,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-708' is-artificial='yes'/>
-                <parameter type-id='type-id-651'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-652'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-706' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -6672,28 +6571,129 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-667'/>
+      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-660'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-695'/>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <parameter type-id='type-id-580'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-661'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-697'/>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-583'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-662'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-586'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-19' is-artificial='yes'/>
+            <return type-id='type-id-29'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-668'/>
+      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-635'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-669'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-657'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-670'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-658'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-477' id='type-id-641'/>
-    <qualified-type-def type-id='type-id-475' id='type-id-648'/>
-    <qualified-type-def type-id='type-id-476' id='type-id-655'/>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-671'/>
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-673'/>
-    <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-675'/>
+    <namespace-decl name='std'>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-659'/>
+    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-701' size-in-bits='64' id='type-id-628'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-631'/>
+    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-705' size-in-bits='64' id='type-id-634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-709' size-in-bits='64' id='type-id-653'/>
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-663'/>
+    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-664'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-665'/>
+    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-666'/>
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-667'/>
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-668'/>
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-669'/>
+    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-627'/>
+    <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
+    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-637'/>
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-640'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-644'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-651'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-654'/>
+    <qualified-type-def type-id='type-id-477' id='type-id-642'/>
+    <qualified-type-def type-id='type-id-475' id='type-id-649'/>
+    <qualified-type-def type-id='type-id-476' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-671'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-673'/>
+    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-675'/>
     <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-677'/>
     <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-679'/>
     <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-681'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-683'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-695'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-710' is-artificial='yes'/>
@@ -6717,7 +6717,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-685'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-697'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-712' is-artificial='yes'/>
@@ -6741,7 +6741,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-687'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-699'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-714' is-artificial='yes'/>
@@ -6765,7 +6765,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-699'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-684'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-716'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6776,7 +6776,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -6797,7 +6797,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-703'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-688'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-718'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6808,7 +6808,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-719' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -6829,7 +6829,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-707'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-692'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-720'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6840,7 +6840,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-721' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -6863,30 +6863,30 @@
     <reference-type-def kind='lvalue' type-id='type-id-722' size-in-bits='64' id='type-id-678'/>
     <reference-type-def kind='lvalue' type-id='type-id-723' size-in-bits='64' id='type-id-680'/>
     <reference-type-def kind='lvalue' type-id='type-id-724' size-in-bits='64' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-689'/>
-    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-690'/>
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-691'/>
-    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-692'/>
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-693'/>
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-694'/>
-    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-695'/>
-    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-696'/>
-    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-697'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-701'/>
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-705'/>
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-704'/>
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-709'/>
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-708'/>
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-684'/>
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-686'/>
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-688'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-701'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-702'/>
+    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-703'/>
+    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-704'/>
+    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-705'/>
+    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-706'/>
+    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-707'/>
+    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-708'/>
+    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-686'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-685'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-690'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-650' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-700'/>
     <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-672'/>
     <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-674'/>
     <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-676'/>
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-710'/>
-    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-712'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-714'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='new_allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-716'>
         <member-function access='private'>
@@ -6965,18 +6965,18 @@
     <qualified-type-def type-id='type-id-626' const='yes' id='type-id-722'/>
     <qualified-type-def type-id='type-id-629' const='yes' id='type-id-723'/>
     <qualified-type-def type-id='type-id-632' const='yes' id='type-id-724'/>
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-717'/>
-    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-719'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-721'/>
     <qualified-type-def type-id='type-id-466' const='yes' id='type-id-725'/>
     <qualified-type-def type-id='type-id-462' const='yes' id='type-id-726'/>
     <qualified-type-def type-id='type-id-464' const='yes' id='type-id-727'/>
     <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-728'/>
     <pointer-type-def type-id='type-id-718' size-in-bits='64' id='type-id-730'/>
     <pointer-type-def type-id='type-id-720' size-in-bits='64' id='type-id-732'/>
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-734'/>
-    <qualified-type-def type-id='type-id-685' const='yes' id='type-id-735'/>
-    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-736'/>
+    <qualified-type-def type-id='type-id-695' const='yes' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-697' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-736'/>
     <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-729'/>
     <reference-type-def kind='lvalue' type-id='type-id-738' size-in-bits='64' id='type-id-731'/>
     <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-733'/>
@@ -7469,12 +7469,12 @@
     <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-768'/>
     <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-769'/>
     <qualified-type-def type-id='type-id-769' const='yes' id='type-id-770'/>
-    <reference-type-def kind='lvalue' type-id='type-id-640' size-in-bits='64' id='type-id-771'/>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-647' size-in-bits='64' id='type-id-772'/>
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-673'/>
-    <reference-type-def kind='lvalue' type-id='type-id-654' size-in-bits='64' id='type-id-773'/>
-    <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-675'/>
+    <reference-type-def kind='lvalue' type-id='type-id-641' size-in-bits='64' id='type-id-771'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-648' size-in-bits='64' id='type-id-772'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-773'/>
+    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-675'/>
     <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-775'/>
     <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-777'/>
     <qualified-type-def type-id='type-id-777' const='yes' id='type-id-778'/>
@@ -7482,9 +7482,9 @@
     <qualified-type-def type-id='type-id-780' const='yes' id='type-id-781'/>
     <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-783'/>
     <qualified-type-def type-id='type-id-783' const='yes' id='type-id-784'/>
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-710'/>
-    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-712'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-714'/>
     <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-786'/>
     <qualified-type-def type-id='type-id-786' const='yes' id='type-id-787'/>
     <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-677'/>
@@ -7508,15 +7508,15 @@
     <reference-type-def kind='lvalue' type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
     <pointer-type-def type-id='type-id-799' size-in-bits='64' id='type-id-801'/>
     <qualified-type-def type-id='type-id-801' const='yes' id='type-id-802'/>
-    <qualified-type-def type-id='type-id-640' const='yes' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-803'/>
     <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-804'/>
     <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-805'/>
     <qualified-type-def type-id='type-id-805' const='yes' id='type-id-806'/>
-    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-807'/>
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-807'/>
     <reference-type-def kind='lvalue' type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
     <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-809'/>
     <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
-    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-811'/>
+    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-811'/>
     <reference-type-def kind='lvalue' type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
     <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-813'/>
     <qualified-type-def type-id='type-id-813' const='yes' id='type-id-814'/>
@@ -7535,13 +7535,13 @@
     <reference-type-def kind='lvalue' type-id='type-id-826' size-in-bits='64' id='type-id-827'/>
     <pointer-type-def type-id='type-id-826' size-in-bits='64' id='type-id-828'/>
     <qualified-type-def type-id='type-id-828' const='yes' id='type-id-829'/>
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-695' const='yes' id='type-id-734'/>
     <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-711'/>
     <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-830'/>
-    <qualified-type-def type-id='type-id-685' const='yes' id='type-id-735'/>
+    <qualified-type-def type-id='type-id-697' const='yes' id='type-id-735'/>
     <reference-type-def kind='lvalue' type-id='type-id-735' size-in-bits='64' id='type-id-713'/>
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-831'/>
-    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-736'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-736'/>
     <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-715'/>
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-832'/>
     <qualified-type-def type-id='type-id-785' const='yes' id='type-id-833'/>
@@ -7596,8 +7596,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-871' size-in-bits='64' id='type-id-872'/>
     <pointer-type-def type-id='type-id-871' size-in-bits='64' id='type-id-874'/>
     <qualified-type-def type-id='type-id-874' const='yes' id='type-id-875'/>
-    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-515'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-479'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-479'/>
     <qualified-type-def type-id='type-id-876' const='yes' id='type-id-877'/>
     <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-878'/>
     <qualified-type-def type-id='type-id-878' const='yes' id='type-id-879'/>
@@ -7617,13 +7617,13 @@
     <qualified-type-def type-id='type-id-897' const='yes' id='type-id-898'/>
     <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
     <qualified-type-def type-id='type-id-899' const='yes' id='type-id-900'/>
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-901'/>
+    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-901'/>
     <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
     <qualified-type-def type-id='type-id-902' const='yes' id='type-id-903'/>
-    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-904'/>
+    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-904'/>
     <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-905'/>
     <qualified-type-def type-id='type-id-905' const='yes' id='type-id-906'/>
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-907'/>
+    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-907'/>
     <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
     <qualified-type-def type-id='type-id-908' const='yes' id='type-id-909'/>
     <qualified-type-def type-id='type-id-910' const='yes' id='type-id-911'/>
@@ -7634,26 +7634,26 @@
     <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-918'/>
     <qualified-type-def type-id='type-id-919' const='yes' id='type-id-920'/>
     <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-921'/>
-    <qualified-type-def type-id='type-id-656' const='yes' id='type-id-620'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-620'/>
     <reference-type-def kind='lvalue' type-id='type-id-620' size-in-bits='64' id='type-id-580'/>
-    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-621'/>
+    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-621'/>
     <reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-583'/>
-    <qualified-type-def type-id='type-id-658' const='yes' id='type-id-622'/>
+    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-622'/>
     <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-586'/>
     <qualified-type-def type-id='type-id-922' const='yes' id='type-id-923'/>
     <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-924'/>
-    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-689'/>
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-628'/>
-    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-637'/>
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-691'/>
-    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-631'/>
-    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-692'/>
-    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-644'/>
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-693'/>
-    <reference-type-def kind='lvalue' type-id='type-id-693' size-in-bits='64' id='type-id-634'/>
-    <qualified-type-def type-id='type-id-707' const='yes' id='type-id-694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-694' size-in-bits='64' id='type-id-651'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-701' size-in-bits='64' id='type-id-628'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-702'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-638'/>
+    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-631'/>
+    <qualified-type-def type-id='type-id-688' const='yes' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-645'/>
+    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-705' size-in-bits='64' id='type-id-634'/>
+    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-706'/>
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-652'/>
     <qualified-type-def type-id='type-id-602' const='yes' id='type-id-623'/>
     <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-579'/>
     <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-925'/>
@@ -7690,31 +7690,31 @@
     <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
     <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-966'/>
     <qualified-type-def type-id='type-id-966' const='yes' id='type-id-967'/>
-    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-695'/>
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-638'/>
-    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-968'/>
+    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-707'/>
+    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-968'/>
     <qualified-type-def type-id='type-id-968' const='yes' id='type-id-969'/>
-    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-696'/>
-    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-645'/>
-    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-970'/>
+    <qualified-type-def type-id='type-id-610' const='yes' id='type-id-708'/>
+    <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-970'/>
     <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
-    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-697'/>
-    <reference-type-def kind='lvalue' type-id='type-id-697' size-in-bits='64' id='type-id-652'/>
-    <pointer-type-def type-id='type-id-697' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-616' const='yes' id='type-id-709'/>
+    <reference-type-def kind='lvalue' type-id='type-id-709' size-in-bits='64' id='type-id-653'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-972'/>
     <qualified-type-def type-id='type-id-972' const='yes' id='type-id-973'/>
     <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-974'/>
     <qualified-type-def type-id='type-id-295' const='yes' id='type-id-975'/>
     <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
     <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-977'/>
-    <qualified-type-def type-id='type-id-533' const='yes' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-587'/>
     <reference-type-def kind='lvalue' type-id='type-id-587' size-in-bits='64' id='type-id-562'/>
     <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-567'/>
-    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-520'/>
     <qualified-type-def type-id='type-id-978' id='type-id-979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-978'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-459'/>
-    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-539'/>
-    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-978'/>
+    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-459'/>
+    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-540'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-506'/>
     <qualified-type-def type-id='type-id-764' const='yes' id='type-id-980'/>
     <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
     <qualified-type-def type-id='type-id-981' const='yes' id='type-id-982'/>
@@ -7764,29 +7764,29 @@
     <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
     <qualified-type-def type-id='type-id-557' const='yes' id='type-id-1029'/>
     <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
-    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-661'/>
-    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-606'/>
-    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-1031'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-606'/>
+    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-1031'/>
     <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1032'/>
-    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-662'/>
-    <reference-type-def kind='lvalue' type-id='type-id-662' size-in-bits='64' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-1033'/>
+    <qualified-type-def type-id='type-id-609' const='yes' id='type-id-666'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-612'/>
+    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1033'/>
     <qualified-type-def type-id='type-id-1033' const='yes' id='type-id-1034'/>
-    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-663'/>
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-618'/>
-    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-1035'/>
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-618'/>
+    <pointer-type-def type-id='type-id-667' size-in-bits='64' id='type-id-1035'/>
     <qualified-type-def type-id='type-id-1035' const='yes' id='type-id-1036'/>
-    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-607'/>
-    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-1037'/>
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-668'/>
+    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-607'/>
+    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-1037'/>
     <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1038'/>
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-613'/>
-    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-1039'/>
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-669'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-613'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-1039'/>
     <qualified-type-def type-id='type-id-1039' const='yes' id='type-id-1040'/>
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-666'/>
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-619'/>
-    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1041'/>
+    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-619'/>
+    <pointer-type-def type-id='type-id-670' size-in-bits='64' id='type-id-1041'/>
     <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1042'/>
     <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1043'/>
     <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1044'/>
@@ -7818,15 +7818,15 @@
     <pointer-type-def type-id='type-id-897' size-in-bits='64' id='type-id-1076'/>
     <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1077'/>
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1079'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-701'/>
-    <qualified-type-def type-id='type-id-701' const='yes' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-705'/>
-    <qualified-type-def type-id='type-id-705' const='yes' id='type-id-1081'/>
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-704'/>
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-709'/>
-    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-1082'/>
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-1080'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-685'/>
+    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-690' const='yes' id='type-id-1081'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-650' size-in-bits='64' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-694' const='yes' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-693'/>
     <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-1083'/>
     <reference-type-def kind='lvalue' type-id='type-id-913' size-in-bits='64' id='type-id-1084'/>
     <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-1085'/>
@@ -7834,23 +7834,23 @@
     <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-1087'/>
     <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-1088'/>
     <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-684'/>
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-686'/>
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-688'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-700'/>
     <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-1090'/>
     <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-1091'/>
     <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-627'/>
     <qualified-type-def type-id='type-id-1092' id='type-id-1093'/>
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1092'/>
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1092'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-717'/>
     <pointer-type-def type-id='type-id-608' size-in-bits='64' id='type-id-630'/>
     <qualified-type-def type-id='type-id-1094' id='type-id-1095'/>
-    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-1094'/>
-    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-719'/>
+    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-719'/>
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-633'/>
     <qualified-type-def type-id='type-id-1096' id='type-id-1097'/>
-    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-721'/>
+    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-721'/>
     <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1098'/>
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-1099'/>
     <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1100'/>
@@ -7875,16 +7875,16 @@
     <qualified-type-def type-id='type-id-1118' const='yes' id='type-id-1119'/>
     <qualified-type-def type-id='type-id-1120' id='type-id-1121'/>
     <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-636'/>
-    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-637'/>
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-640'/>
     <qualified-type-def type-id='type-id-1122' id='type-id-1123'/>
     <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1122'/>
-    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-643'/>
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-644'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-647'/>
     <qualified-type-def type-id='type-id-1124' id='type-id-1125'/>
     <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-1124'/>
-    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-650'/>
-    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-653'/>
+    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-651'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-654'/>
     <reference-type-def kind='lvalue' type-id='type-id-4' size-in-bits='64' id='type-id-1126'/>
     <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-588'/>
     <qualified-type-def type-id='type-id-588' const='yes' id='type-id-1127'/>
@@ -7894,9 +7894,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
     <qualified-type-def type-id='type-id-589' id='type-id-566'/>
     <reference-type-def kind='lvalue' type-id='type-id-14' size-in-bits='64' id='type-id-589'/>
-    <reference-type-def kind='lvalue' type-id='type-id-533' size-in-bits='64' id='type-id-1132'/>
+    <reference-type-def kind='lvalue' type-id='type-id-534' size-in-bits='64' id='type-id-1132'/>
     <qualified-type-def type-id='type-id-561' const='yes' id='type-id-563'/>
-    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-560'/>
     <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-1133'/>
     <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-460'/>
     <qualified-type-def type-id='type-id-460' const='yes' id='type-id-1134'/>
@@ -7924,7 +7924,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-541' size-in-bits='64' id='type-id-1148'/>
     <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-523'/>
     <qualified-type-def type-id='type-id-523' const='yes' id='type-id-522'/>
-    <qualified-type-def type-id='type-id-477' id='type-id-641'/>
+    <qualified-type-def type-id='type-id-477' id='type-id-642'/>
     <reference-type-def kind='lvalue' type-id='type-id-522' size-in-bits='64' id='type-id-477'/>
     <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-465'/>
     <reference-type-def kind='lvalue' type-id='type-id-523' size-in-bits='64' id='type-id-1149'/>
@@ -7935,7 +7935,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-542' size-in-bits='64' id='type-id-1151'/>
     <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-525'/>
     <qualified-type-def type-id='type-id-525' const='yes' id='type-id-524'/>
-    <qualified-type-def type-id='type-id-475' id='type-id-648'/>
+    <qualified-type-def type-id='type-id-475' id='type-id-649'/>
     <reference-type-def kind='lvalue' type-id='type-id-524' size-in-bits='64' id='type-id-475'/>
     <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-461'/>
     <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-1152'/>
@@ -7946,7 +7946,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-543' size-in-bits='64' id='type-id-1154'/>
     <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-527'/>
     <qualified-type-def type-id='type-id-527' const='yes' id='type-id-526'/>
-    <qualified-type-def type-id='type-id-476' id='type-id-655'/>
+    <qualified-type-def type-id='type-id-476' id='type-id-656'/>
     <reference-type-def kind='lvalue' type-id='type-id-526' size-in-bits='64' id='type-id-476'/>
     <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-463'/>
     <reference-type-def kind='lvalue' type-id='type-id-527' size-in-bits='64' id='type-id-1155'/>
@@ -7974,7 +7974,7 @@
     <qualified-type-def type-id='type-id-617' const='yes' id='type-id-1168'/>
     <namespace-decl name='std'>
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='86' column='1' id='type-id-1169'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-512'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-515'/>
       </class-decl>
       <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_bvector.h' line='186' column='1' id='type-id-859'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-864'/>
@@ -8050,7 +8050,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-540'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='79' column='1' id='type-id-533'/>
       <class-decl name='random_access_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-1173'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1169'/>
       </class-decl>
@@ -8115,51 +8115,51 @@
         </member-function>
       </class-decl>
       <class-decl name='equal_to&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='200' column='1' id='type-id-602'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
       </class-decl>
-      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-667'/>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-669'/>
+      <class-decl name='binary_function&lt;int, int, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='113' column='1' id='type-id-635'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-658'/>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-610'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-642'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-475'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-462'/>
             <parameter type-id='type-id-462'/>
@@ -8168,22 +8168,22 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE7reserveEm'>
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPFvP25vtkMultiProcessControllerPvEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
-            <parameter type-id='type-id-646' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-647' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-647' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-648' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-648' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-649' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-703'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-688'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-718'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8194,7 +8194,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-719' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -8213,10 +8213,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-642'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-643'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-702'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-703'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-687'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-688'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8228,46 +8228,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-704' is-artificial='yes'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-704' is-artificial='yes'/>
-                <parameter type-id='type-id-644'/>
+                <parameter type-id='type-id-689' is-artificial='yes'/>
+                <parameter type-id='type-id-645'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-702' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-687' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-705' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -8304,48 +8304,48 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-670'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, void*&gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-659'/>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-616'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-649'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-650'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-476'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
-            <parameter type-id='type-id-652'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-464'/>
             <parameter type-id='type-id-464'/>
@@ -8354,22 +8354,22 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE7reserveEm'>
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiPvEEESaIS7_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS7_S9_EEmRKS7_'>
-            <parameter type-id='type-id-653' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-654' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-654' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-655' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-655' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-656' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-707'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-692'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-720'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8380,7 +8380,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-721' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -8399,10 +8399,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-649'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-650'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-706'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-691'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8414,46 +8414,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-708' is-artificial='yes'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-708' is-artificial='yes'/>
-                <parameter type-id='type-id-651'/>
+                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-652'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-706' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-652'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -8489,48 +8489,48 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-668'/>
+      <class-decl name='unary_function&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, const int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='101' column='1' id='type-id-657'/>
       <class-decl name='vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='171' column='1' id='type-id-604'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-477'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
-            <parameter type-id='type-id-638'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
+            <parameter type-id='type-id-639'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='960' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-636' is-artificial='yes'/>
+            <parameter type-id='type-id-637' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-466'/>
             <parameter type-id='type-id-466'/>
@@ -8539,22 +8539,22 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE7reserveEm'>
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='65' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPN6vtksys15_Hashtable_nodeISt4pairIKiS_IN25vtkMultiProcessController11vtkInternal14vtkRMICallbackESaIS6_EEEEESaISB_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPSB_SD_EEmRKSB_'>
-            <parameter type-id='type-id-639' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-640' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-640' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-641' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
-            <parameter type-id='type-id-641' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
+            <parameter type-id='type-id-642' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='850' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-699'>
+      <class-decl name='allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-684'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-716'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8565,7 +8565,7 @@
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-717' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -8602,10 +8602,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-635'>
+      <class-decl name='_Vector_base&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-636'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-698'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-683'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-684'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
@@ -8617,46 +8617,46 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-700' is-artificial='yes'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-700' is-artificial='yes'/>
-                <parameter type-id='type-id-637'/>
+                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-638'/>
                 <return type-id='type-id-29'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-698' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-683' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-638'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-701' is-artificial='yes'/>
+            <parameter type-id='type-id-686' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -8854,8 +8854,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-512'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-540'/>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='83' column='1' id='type-id-515'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
       </class-decl>
       <class-decl name='_List_iterator&lt;int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_list.h' line='114' column='1' id='type-id-884'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -9370,70 +9370,70 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-683'/>
+      <class-decl name='allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-660'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-695'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-580'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-684' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-685'/>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-661'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-697'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-583'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-686' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-687'/>
+      <class-decl name='allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='87' column='1' id='type-id-662'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-699'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-586'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-688' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
@@ -10195,7 +10195,7 @@
       </class-decl>
       <class-decl name='hash&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_fun.hxx' line='106' column='1' id='type-id-601'/>
       <class-decl name='hash_select1st&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-609'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-669'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-658'/>
       </class-decl>
       <class-decl name='hash_map&lt;int, void*, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-557'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -10289,7 +10289,7 @@
         </member-function>
       </class-decl>
       <class-decl name='hash_select1st&lt;const int, void*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-615'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-670'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-659'/>
       </class-decl>
       <class-decl name='hash_map&lt;int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt;, vtksys::hash&lt;int&gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='82' column='1' id='type-id-555'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -10383,7 +10383,7 @@
         </member-function>
       </class-decl>
       <class-decl name='hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='62' column='1' id='type-id-603'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-668'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-657'/>
       </class-decl>
       <class-decl name='_Hashtable_iterator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, int, vtksys::hash&lt;int&gt;, vtksys::hash_select1st&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt;, std::equal_to&lt;int&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hashtable.hxx' line='330' column='1' id='type-id-999'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -10481,7 +10481,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-640'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-641'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-466' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -10499,7 +10499,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-647'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-648'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-462' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -10517,7 +10517,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-654'>
+      <class-decl name='__normal_iterator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;**, std::vector&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*, std::allocator&lt;vtksys::_Hashtable_node&lt;std::pair&lt;const int, void*&gt; &gt;*&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-655'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-464' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
@@ -10795,7 +10795,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-685'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void (*)(vtkMultiProcessController*, void*)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-697'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-712' is-artificial='yes'/>
@@ -10817,7 +10817,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-687'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, void*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-699'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-714' is-artificial='yes'/>
@@ -10839,7 +10839,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-683'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const int, std::vector&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator&lt;vtkMultiProcessController::vtkInternal::vtkRMICallback&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='52' column='1' id='type-id-695'>
         <member-function access='private'>
           <function-decl name='new_allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-710' is-artificial='yes'/>
@@ -10919,17 +10919,17 @@
     <reference-type-def kind='lvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1243'/>
     <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1244'/>
-    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1245'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-1245'/>
     <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1246'/>
     <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1247'/>
     <qualified-type-def type-id='type-id-482' const='yes' id='type-id-1248'/>
     <reference-type-def kind='lvalue' type-id='type-id-1248' size-in-bits='64' id='type-id-1249'/>
     <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-1250'/>
     <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
-    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-537'/>
-    <qualified-type-def type-id='type-id-519' id='type-id-1252'/>
-    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-519'/>
-    <pointer-type-def type-id='type-id-537' size-in-bits='64' id='type-id-1253'/>
+    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-538'/>
+    <qualified-type-def type-id='type-id-508' id='type-id-1252'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1253'/>
     <qualified-type-def type-id='type-id-1253' const='yes' id='type-id-1254'/>
     <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1256'/>
     <reference-type-def kind='lvalue' type-id='type-id-1256' size-in-bits='64' id='type-id-1257'/>
@@ -10939,37 +10939,37 @@
     <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1261'/>
     <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1262'/>
     <qualified-type-def type-id='type-id-264' id='type-id-1263'/>
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-538'/>
-    <qualified-type-def type-id='type-id-509' id='type-id-513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-509'/>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1264'/>
+    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-539'/>
+    <qualified-type-def type-id='type-id-512' id='type-id-516'/>
+    <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-1264'/>
     <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-1265'/>
     <qualified-type-def type-id='type-id-276' id='type-id-82'/>
     <qualified-type-def type-id='type-id-284' id='type-id-87'/>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-516'/>
-    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-498'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-519'/>
+    <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-498'/>
     <qualified-type-def type-id='type-id-307' const='yes' id='type-id-64'/>
     <qualified-type-def type-id='type-id-331' id='type-id-79'/>
     <qualified-type-def type-id='type-id-332' id='type-id-69'/>
     <qualified-type-def type-id='type-id-333' id='type-id-77'/>
     <qualified-type-def type-id='type-id-336' id='type-id-76'/>
     <qualified-type-def type-id='type-id-337' id='type-id-73'/>
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-531'/>
     <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
     <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-530'/>
     <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-1266'/>
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-518'/>
-    <qualified-type-def type-id='type-id-518' const='yes' id='type-id-1267'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-507'/>
+    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1267'/>
     <reference-type-def kind='lvalue' type-id='type-id-472' size-in-bits='64' id='type-id-1268'/>
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-520'/>
-    <qualified-type-def type-id='type-id-520' const='yes' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-509'/>
+    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-1269'/>
     <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1270'/>
     <qualified-type-def type-id='type-id-372' const='yes' id='type-id-1271'/>
     <qualified-type-def type-id='type-id-377' const='yes' id='type-id-1272'/>
     <qualified-type-def type-id='type-id-378' id='type-id-1273'/>
-    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-508'/>
-    <qualified-type-def type-id='type-id-508' const='yes' id='type-id-511'/>
+    <reference-type-def kind='lvalue' type-id='type-id-57' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-511'/>
+    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-514'/>
     <qualified-type-def type-id='type-id-385' id='type-id-71'/>
     <qualified-type-def type-id='type-id-389' id='type-id-65'/>
     <qualified-type-def type-id='type-id-393' id='type-id-70'/>
@@ -11000,7 +11000,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-468'/>
             <return type-id='type-id-29'/>
@@ -11008,14 +11008,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-520' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
+            <parameter type-id='type-id-508'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -11035,7 +11035,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-468'/>
             <return type-id='type-id-29'/>
@@ -11043,36 +11043,36 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Deque_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-518' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
+            <parameter type-id='type-id-507' is-artificial='yes'/>
+            <parameter type-id='type-id-508'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='deque&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='639' column='1' id='type-id-57'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-507'/>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-510'/>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-251'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='710' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-290'/>
             <parameter type-id='type-id-251'/>
@@ -11081,41 +11081,41 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
-            <parameter type-id='type-id-509'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
+            <parameter type-id='type-id-512'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~deque' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-19' is-artificial='yes'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_dispatch&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1587' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-482'/>
             <parameter type-id='type-id-482'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-482'/>
             <parameter type-id='type-id-482'/>
@@ -11124,7 +11124,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='insert&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1345' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-508' is-artificial='yes'/>
+            <parameter type-id='type-id-511' is-artificial='yes'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
             <parameter type-id='type-id-472'/>
@@ -11133,7 +11133,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reallocate_map' mangled-name='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE17_M_reallocate_mapEmb'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <parameter type-id='type-id-1' name='__add_at_front' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='796' column='1'/>
             <return type-id='type-id-29'/>
@@ -11141,35 +11141,35 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reserve_map_at_back' mangled-name='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1715' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE22_M_reserve_map_at_backEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_new_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE24_M_new_elements_at_frontEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_new_elements_at_back' mangled-name='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE23_M_new_elements_at_backEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__nodes_to_add' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1723' column='1'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_reserve_elements_at_front' mangled-name='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE28_M_reserve_elements_at_frontEm'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='1679' column='1'/>
             <return type-id='type-id-472'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_m'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <parameter type-id='type-id-472' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
@@ -11179,17 +11179,17 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRhPhEEEvS6_T_S7_St20forward_iterator_tag'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <parameter type-id='type-id-472' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <parameter type-id='type-id-472' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxESt15_Deque_iteratorIhRhPhEmRKh'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <parameter type-id='type-id-40' name='__n' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
             <parameter type-id='type-id-291' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='235' column='1'/>
@@ -11198,7 +11198,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE13_M_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_m'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='636' column='1'/>
             <parameter type-id='type-id-482' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='637' column='1'/>
@@ -11208,23 +11208,23 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_insert_aux&lt;std::_Deque_iterator&lt;unsigned char, const unsigned char&amp;, const unsigned char*&gt; &gt;' mangled-name='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEE19_M_range_insert_auxISt15_Deque_iteratorIhRKhPS4_EEEvS3_IhRhPhET_SB_St20forward_iterator_tag'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-472' name='__pos' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='463' column='1'/>
             <parameter type-id='type-id-482' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
             <parameter type-id='type-id-482' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='464' column='1'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt5dequeIhSaIhEEaSERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5dequeIhSaIhEEaSERKS1_'>
-            <parameter type-id='type-id-511' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-513' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
-            <return type-id='type-id-514'/>
+            <parameter type-id='type-id-514' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-516' name='__x' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/deque.tcc' line='65' column='1'/>
+            <return type-id='type-id-517'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-507'>
+      <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-510'>
         <member-type access='protected'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-528'>
             <underlying-type type-id='type-id-25'/>
@@ -11347,10 +11347,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-510'/>
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/cpp_type_traits.h' line='79' column='1' id='type-id-513'/>
       <function-decl name='operator==&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-519'/>
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
+        <parameter type-id='type-id-508'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__deque_buf_size' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11358,7 +11358,7 @@
         <return type-id='type-id-40'/>
       </function-decl>
       <function-decl name='__iterator_category&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_types.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
         <return type-id='type-id-1173'/>
       </function-decl>
       <function-decl name='__distance&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_funcs.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11436,8 +11436,8 @@
         <return type-id='type-id-29'/>
       </function-decl>
       <function-decl name='operator!=&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-519'/>
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
+        <parameter type-id='type-id-508'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__fill_a&lt;std::_Deque_iterator&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;, unsigned char&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11612,8 +11612,8 @@
         <return type-id='type-id-89'/>
       </function-decl>
       <function-decl name='operator-&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-519'/>
-        <parameter type-id='type-id-519'/>
+        <parameter type-id='type-id-508'/>
+        <parameter type-id='type-id-508'/>
         <return type-id='type-id-49'/>
       </function-decl>
       <function-decl name='copy&lt;unsigned char**, unsigned char**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11701,15 +11701,15 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-659'/>
-    <reference-type-def kind='lvalue' type-id='type-id-659' size-in-bits='64' id='type-id-594'/>
-    <pointer-type-def type-id='type-id-659' size-in-bits='64' id='type-id-596'/>
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-594'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-596'/>
     <qualified-type-def type-id='type-id-564' const='yes' id='type-id-595'/>
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-599'/>
+    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-597'/>
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-599'/>
     <qualified-type-def type-id='type-id-569' const='yes' id='type-id-598'/>
     <namespace-decl name='std'>
       <class-decl name='__miter_base&lt;int*, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-1285'/>
@@ -12340,8 +12340,8 @@
     <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1364'/>
     <reference-type-def kind='lvalue' type-id='type-id-1364' size-in-bits='64' id='type-id-1365'/>
     <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-1366'/>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-537' size-in-bits='64' id='type-id-504'/>
     <qualified-type-def type-id='type-id-1367' const='yes' id='type-id-1368'/>
     <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-1369'/>
     <qualified-type-def type-id='type-id-1369' const='yes' id='type-id-1370'/>
@@ -12539,7 +12539,7 @@
         </member-function>
       </class-decl>
       <class-decl name='less&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_function.h' line='227' column='1' id='type-id-1433'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-667'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-1407'>
         <member-type access='public'>
@@ -12790,7 +12790,7 @@
             <parameter type-id='type-id-1504' is-artificial='yes'/>
             <parameter type-id='type-id-1371'/>
             <parameter type-id='type-id-1371'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -13041,7 +13041,7 @@
             <parameter type-id='type-id-1321'/>
             <parameter type-id='type-id-34'/>
             <parameter type-id='type-id-34'/>
-            <parameter type-id='type-id-510'/>
+            <parameter type-id='type-id-513'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -13060,7 +13060,7 @@
             <parameter type-id='type-id-1321' name='__position' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='479' column='1'/>
             <parameter type-id='type-id-34' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='479' column='1'/>
             <parameter type-id='type-id-34' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='480' column='1'/>
-            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-515'/>
             <return type-id='type-id-29'/>
           </function-decl>
         </member-function>
@@ -13146,7 +13146,7 @@
       <function-decl name='__distance&lt;std::_List_const_iterator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_funcs.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1371'/>
         <parameter type-id='type-id-1371'/>
-        <parameter type-id='type-id-540'/>
+        <parameter type-id='type-id-533'/>
         <return type-id='type-id-49'/>
       </function-decl>
       <function-decl name='distance&lt;std::_List_const_iterator&lt;std::vector&lt;char, std::allocator&lt;char&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_funcs.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13545,7 +13545,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <class-decl name='vtkSocketController' size-in-bits='896' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.h' line='47' column='1' id='type-id-1549'>
-      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
       <data-member access='protected' static='yes'>
         <var-decl name='Initialized' type-id='type-id-19' mangled-name='_ZN19vtkSocketController11InitializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' line='27' column='1' elf-symbol-id='_ZN19vtkSocketController11InitializedE'/>
       </data-member>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 469c9fc0..613c017f 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1431,70 +1431,6 @@
       <parameter type-id='type-id-28'/>
       <return type-id='type-id-51'/>
     </function-decl>
-    <enum-decl name='node_type' filepath='../.././libcpp/include/cpplib.h' line='614' column='1' id='type-id-80'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='NT_VOID' value='0'/>
-      <enumerator name='NT_MACRO' value='1'/>
-      <enumerator name='NT_ASSERTION' value='2'/>
-    </enum-decl>
-    <function-type size-in-bits='64' id='type-id-118'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-59'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-119'>
-      <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-133'/>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-1'/>
-      <return type-id='type-id-1'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-120'>
-      <parameter type-id='type-id-127'/>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-76'/>
-      <parameter type-id='type-id-76'/>
-      <return type-id='type-id-51'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-129'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-14'/>
-      <return type-id='type-id-18'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-135'>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-137'>
-      <parameter type-id='type-id-127'/>
-      <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-98'/>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-138'>
-      <parameter type-id='type-id-127'/>
-      <parameter type-id='type-id-128'/>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-139'>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-140'>
-      <parameter type-id='type-id-14'/>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-142'>
-      <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-59'/>
-      <return type-id='type-id-31'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-143'>
-      <parameter type-id='type-id-21'/>
-      <return type-id='type-id-14'/>
-    </function-type>
     <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-79'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='str' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
@@ -1565,6 +1501,70 @@
         <var-decl name='sysdep' type-id='type-id-14' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
       </data-member>
     </class-decl>
+    <enum-decl name='node_type' filepath='../.././libcpp/include/cpplib.h' line='614' column='1' id='type-id-80'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='NT_VOID' value='0'/>
+      <enumerator name='NT_MACRO' value='1'/>
+      <enumerator name='NT_ASSERTION' value='2'/>
+    </enum-decl>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-21'/>
+      <return type-id='type-id-59'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-119'>
+      <parameter type-id='type-id-39'/>
+      <parameter type-id='type-id-133'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <parameter type-id='type-id-1'/>
+      <return type-id='type-id-1'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-127'/>
+      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-76'/>
+      <parameter type-id='type-id-76'/>
+      <return type-id='type-id-51'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-129'>
+      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-14'/>
+      <return type-id='type-id-18'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-135'>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-137'>
+      <parameter type-id='type-id-127'/>
+      <parameter type-id='type-id-15'/>
+      <parameter type-id='type-id-98'/>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-138'>
+      <parameter type-id='type-id-127'/>
+      <parameter type-id='type-id-128'/>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-139'>
+      <parameter type-id='type-id-18'/>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-140'>
+      <parameter type-id='type-id-14'/>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-142'>
+      <parameter type-id='type-id-14'/>
+      <parameter type-id='type-id-59'/>
+      <return type-id='type-id-31'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-143'>
+      <parameter type-id='type-id-21'/>
+      <return type-id='type-id-14'/>
+    </function-type>
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-81'>
       <data-member access='private'>
         <var-decl name='macro' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
@@ -1600,8 +1600,6 @@
     </enum-decl>
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-154'/>
     <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-152'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-150' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
@@ -1610,7 +1608,7 @@
         <var-decl name='count' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-156'>
@@ -1627,16 +1625,15 @@
         <var-decl name='system_microseconds' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-153'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-154'/>
     <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
     <typedef-decl name='pid_t' type-id='type-id-161' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-157'/>
-    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
-      <subrange length='1' type-id='type-id-4' id='type-id-7'/>
-    </array-type-def>
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-162'>
           <data-member access='private'>
-            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
@@ -1644,10 +1641,10 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='line' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='54' column='1'/>
@@ -1677,56 +1674,54 @@
         <var-decl name='extra_tokens' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='192' id='type-id-158'>
+      <subrange length='1' type-id='type-id-4' id='type-id-7'/>
+    </array-type-def>
     <typedef-decl name='__pid_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-170'/>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-172'>
       <member-type access='public'>
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-174'>
           <data-member access='private'>
-            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='token_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
@@ -1740,19 +1735,42 @@
         <var-decl name='src_loc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <var-decl name='flags' type-id='type-id-29' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-174' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+      </data-member>
+    </class-decl>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-171'/>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-175'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-177'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-176'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-178'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -1842,24 +1860,6 @@
       <enumerator name='CPP_LAST_PUNCTUATOR' value='52'/>
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
-      </data-member>
-    </class-decl>
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
-      </data-member>
-    </class-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <class-decl name='line_maps' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libcpp/include/line-map.h' line='263' column='1' id='type-id-185'>
@@ -3467,7 +3467,7 @@
       <parameter type-id='type-id-261'/>
       <parameter type-id='type-id-32'/>
       <parameter type-id='type-id-262'/>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
@@ -3475,7 +3475,7 @@
       <parameter type-id='type-id-261'/>
       <parameter type-id='type-id-32'/>
       <parameter type-id='type-id-262'/>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/charset.c' line='1602' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
@@ -3515,9 +3515,6 @@
     <typedef-decl name='cppchar_t' type-id='type-id-13' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-259'/>
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-264'/>
-    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
-    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='previous' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
@@ -3526,20 +3523,16 @@
         <var-decl name='prev_class' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
+    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
+    <typedef-decl name='cpp_string' type-id='type-id-176' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
     <typedef-decl name='off_t' type-id='type-id-54' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-274'/>
     <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-275'/>
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='normalized_KC' value='0'/>
-      <enumerator name='normalized_C' value='1'/>
-      <enumerator name='normalized_identifier_C' value='2'/>
-      <enumerator name='normalized_none' value='3'/>
-    </enum-decl>
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-278'>
       <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-279'>
@@ -3591,7 +3584,7 @@
         <var-decl name='directive' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='invocation_location' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -3645,7 +3638,7 @@
         <var-decl name='mi_valid' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <var-decl name='base_run' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
@@ -3687,10 +3680,10 @@
         <var-decl name='time' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <var-decl name='deps' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
@@ -3753,92 +3746,87 @@
         <var-decl name='forced_token_location_p' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-276'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='normalized_KC' value='0'/>
+      <enumerator name='normalized_C' value='1'/>
+      <enumerator name='normalized_identifier_C' value='2'/>
+      <enumerator name='normalized_none' value='3'/>
+    </enum-decl>
+    <typedef-decl name='cpp_token' type-id='type-id-172' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
     <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-321'>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
@@ -3848,17 +3836,17 @@
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-325'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -3872,16 +3860,16 @@
         <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-325' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-327' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-288'>
@@ -3904,23 +3892,23 @@
         <var-decl name='canonical_name' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-332'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='missing_files' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -3940,7 +3928,7 @@
         <var-decl name='tabstop' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cplusplus' type-id='type-id-27' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -4066,7 +4054,7 @@
         <var-decl name='input_charset' type-id='type-id-15' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-276' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <var-decl name='warn_invalid_pch' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -4075,7 +4063,7 @@
         <var-decl name='restore_pch_deps' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='precision' type-id='type-id-32' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -4107,7 +4095,7 @@
     </class-decl>
     <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cd' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
@@ -4174,46 +4162,25 @@
         <var-decl name='n__VA_ARGS__' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-296'/>
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
     <typedef-decl name='cpp_comment_table' type-id='type-id-347' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-303'/>
     <typedef-decl name='tokenrun' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-292'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
-    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='CLK_GNUC89' value='0'/>
-      <enumerator name='CLK_GNUC99' value='1'/>
-      <enumerator name='CLK_GNUC11' value='2'/>
-      <enumerator name='CLK_STDC89' value='3'/>
-      <enumerator name='CLK_STDC94' value='4'/>
-      <enumerator name='CLK_STDC99' value='5'/>
-      <enumerator name='CLK_STDC11' value='6'/>
-      <enumerator name='CLK_GNUCXX' value='7'/>
-      <enumerator name='CLK_CXX98' value='8'/>
-      <enumerator name='CLK_GNUCXX11' value='9'/>
-      <enumerator name='CLK_CXX11' value='10'/>
-      <enumerator name='CLK_ASM' value='11'/>
-    </enum-decl>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
-      <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
-      <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
-    </enum-decl>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
-      <underlying-type type-id='type-id-26'/>
-      <enumerator name='DEPS_NONE' value='0'/>
-      <enumerator name='DEPS_USER' value='1'/>
-      <enumerator name='DEPS_SYSTEM' value='2'/>
-    </enum-decl>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
     <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-305'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
@@ -4281,7 +4248,7 @@
         <var-decl name='buffer_valid' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-338'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
@@ -4298,7 +4265,7 @@
         <var-decl name='rlimit' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-351' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='cur_note' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -4319,7 +4286,7 @@
         <var-decl name='timestamp' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -4343,8 +4310,8 @@
         <var-decl name='input_cset_desc' type-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-310'/>
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-339'/>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-340'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
@@ -4367,9 +4334,9 @@
         <var-decl name='is_undef' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-341'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ntargets' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -4378,7 +4345,7 @@
         <var-decl name='targets_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ndeps' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -4387,7 +4354,7 @@
         <var-decl name='deps_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='vpathlv' type-id='type-id-211' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
@@ -4399,16 +4366,16 @@
         <var-decl name='vpaths_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-313'/>
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-342'/>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-343'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='alloc_subobject' type-id='type-id-213' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
@@ -4432,21 +4399,21 @@
         <var-decl name='entries_owned' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/symtab.h' line='70' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-355' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='loc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/expr.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-178' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-316'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-345'/>
     <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
@@ -4455,15 +4422,15 @@
         <var-decl name='prev' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -4472,11 +4439,44 @@
         <var-decl name='allocated' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-357' const='yes' id='type-id-336'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-317'/>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-334'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='CLK_GNUC89' value='0'/>
+      <enumerator name='CLK_GNUC99' value='1'/>
+      <enumerator name='CLK_GNUC11' value='2'/>
+      <enumerator name='CLK_STDC89' value='3'/>
+      <enumerator name='CLK_STDC94' value='4'/>
+      <enumerator name='CLK_STDC99' value='5'/>
+      <enumerator name='CLK_STDC11' value='6'/>
+      <enumerator name='CLK_GNUCXX' value='7'/>
+      <enumerator name='CLK_CXX98' value='8'/>
+      <enumerator name='CLK_GNUCXX11' value='9'/>
+      <enumerator name='CLK_CXX11' value='10'/>
+      <enumerator name='CLK_ASM' value='11'/>
+    </enum-decl>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-327'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
+      <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
+      <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
+    </enum-decl>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-333'>
+      <underlying-type type-id='type-id-26'/>
+      <enumerator name='DEPS_NONE' value='0'/>
+      <enumerator name='DEPS_USER' value='1'/>
+      <enumerator name='DEPS_SYSTEM' value='2'/>
+    </enum-decl>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-326'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-335'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-331'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-330'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-316'/>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
       <data-member access='private'>
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
@@ -4484,27 +4484,27 @@
         <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-351'/>
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-358'/>
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-352'/>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
-    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
-    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-353'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-352'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-357'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-355'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-354'/>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-361'/>
     <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
@@ -4520,7 +4520,7 @@
       </data-member>
     </class-decl>
     <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-379'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-361' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -4534,7 +4534,6 @@
     <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
     <typedef-decl name='cpp_comment' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-377'/>
     <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='pos' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
@@ -4551,10 +4550,11 @@
         <var-decl name='sloc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
     <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-383'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <typedef-decl name='pragma_cb' type-id='type-id-329' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-319' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-387'/>
     <typedef-decl name='cpp_options' type-id='type-id-300' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-388'/>
     <typedef-decl name='cpp_callbacks' type-id='type-id-297' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-389'/>
     <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-390'>
@@ -4816,7 +4816,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-360'/>
+    <typedef-decl name='cpp_num' type-id='type-id-380' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-355'/>
     <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-380'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='high' type-id='type-id-383' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
@@ -4844,27 +4844,27 @@
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_remove_type' mangled-name='_Z30cpp_userdef_string_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z30cpp_userdef_string_remove_type9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-181'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_add_type' mangled-name='_Z27cpp_userdef_string_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_userdef_string_add_type9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-181'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_remove_type' mangled-name='_Z28cpp_userdef_char_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_userdef_char_remove_type9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-181'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_add_type' mangled-name='_Z25cpp_userdef_char_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_userdef_char_add_type9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-181'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-178'/>
     </function-decl>
     <function-decl name='cpp_userdef_string_p' mangled-name='_Z20cpp_userdef_string_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_userdef_string_p9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_userdef_char_p' mangled-name='_Z18cpp_userdef_char_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_userdef_char_p9cpp_ttype'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_get_userdef_suffix' mangled-name='_Z22cpp_get_userdef_suffixPK9cpp_token' filepath='../.././libcpp/expr.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_get_userdef_suffixPK9cpp_token'>
@@ -4874,23 +4874,23 @@
     <function-decl name='cpp_classify_number' mangled-name='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc' filepath='../.././libcpp/expr.c' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc'>
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
-      <parameter type-id='type-id-338' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-328' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='cpp_interpret_integer' mangled-name='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj' filepath='../.././libcpp/expr.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj'>
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <parameter type-id='type-id-263' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <parameter type-id='type-id-13' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
-      <return type-id='type-id-360'/>
+      <return type-id='type-id-355'/>
     </function-decl>
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
       <return type-id='type-id-299'/>
     </function-decl>
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
-      <parameter type-id='type-id-360' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-355' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <parameter type-id='type-id-32' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
-      <return type-id='type-id-360'/>
+      <return type-id='type-id-355'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
@@ -5140,12 +5140,12 @@
       <parameter type-id='type-id-89'/>
       <return type-id='type-id-32'/>
     </function-decl>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
     <function-type size-in-bits='64' id='type-id-408'>
       <parameter type-id='type-id-100'/>
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-18'/>
     </function-type>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <typedef-decl name='ht_cb' type-id='type-id-409' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-410'/>
@@ -5184,7 +5184,7 @@
       <return type-id='type-id-18'/>
     </function-type>
     <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
-    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
+    <typedef-decl name='hash_table' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-154' size-in-bits='2048' id='type-id-414'>
@@ -5195,11 +5195,11 @@
     </array-type-def>
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
-      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-334' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <return type-id='type-id-31'/>
     </function-decl>
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
-      <parameter type-id='type-id-344' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-334' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <parameter type-id='type-id-412' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <parameter type-id='type-id-196' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
       <return type-id='type-id-258'/>
@@ -5247,7 +5247,7 @@
         <var-decl name='prev_class' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='711' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='cpp_context' type-id='type-id-284' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-416'/>
@@ -5296,7 +5296,7 @@
       <return type-id='type-id-280'/>
     </function-decl>
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
-      <parameter type-id='type-id-181' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-178' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <parameter type-id='type-id-27' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <return type-id='type-id-15'/>
     </function-decl>
@@ -5332,7 +5332,7 @@
       <return type-id='type-id-263'/>
     </function-decl>
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
-      <parameter type-id='type-id-164' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <parameter type-id='type-id-163' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <return type-id='type-id-417'/>
     </function-decl>
     <function-decl name='cpp_force_token_locations' mangled-name='_Z25cpp_force_token_locationsP10cpp_readerPj' filepath='../.././libcpp/lex.c' line='2910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_force_token_locationsP10cpp_readerPj'>
@@ -5365,28 +5365,28 @@
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='cpp_named_operator2name' mangled-name='cpp_named_operator2name' filepath='../.././libcpp/internal.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpp_named_operator2name'>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-178'/>
       <return type-id='type-id-15'/>
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-162' size-in-bits='192' id='type-id-159'>
+    <array-type-def dimensions='1' type-id='type-id-172' size-in-bits='192' id='type-id-158'>
       <subrange length='1' type-id='type-id-4' id='type-id-7'/>
     </array-type-def>
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-162'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-172'>
       <member-type access='public'>
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-177'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-174'>
           <data-member access='private'>
-            <var-decl name='node' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='source' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='str' type-id='type-id-179' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='macro_arg' type-id='type-id-180' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='token_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
@@ -5400,13 +5400,13 @@
         <var-decl name='src_loc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-181' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-178' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <var-decl name='flags' type-id='type-id-29' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='val' type-id='type-id-177' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-174' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-79'>
@@ -5441,23 +5441,23 @@
       </data-member>
     </union-decl>
     <typedef-decl name='cpp_macro' type-id='type-id-160' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-155'/>
-    <typedef-decl name='cpp_token' type-id='type-id-162' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-276'/>
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-178'>
+    <typedef-decl name='cpp_token' type-id='type-id-172' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-277'/>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-175'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-351'/>
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-180'>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-78' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-357'/>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-177'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='arg_no' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-160'>
       <member-type access='public'>
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-163'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-162'>
           <data-member access='private'>
-            <var-decl name='tokens' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='text' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
@@ -5465,10 +5465,10 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-165' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-164' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='exp' type-id='type-id-163' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-162' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='line' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='54' column='1'/>
@@ -5498,7 +5498,7 @@
         <var-decl name='extra_tokens' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-181'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-178'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -5596,7 +5596,7 @@
         <var-decl name='count' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='30' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='first' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-151'>
@@ -5614,7 +5614,7 @@
       <enumerator name='BT_FIRST_USER' value='10'/>
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-179'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
       </data-member>
@@ -5625,9 +5625,9 @@
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-150'/>
     <qualified-type-def type-id='type-id-27' const='yes' id='type-id-154'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-145'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-164'/>
     <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-149'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-163'/>
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-31'/>
@@ -5873,7 +5873,7 @@
         <var-decl name='directive' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='directive_result' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='invocation_location' type-id='type-id-103' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -5927,7 +5927,7 @@
         <var-decl name='mi_valid' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='450' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='cur_token' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <var-decl name='base_run' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
@@ -5969,10 +5969,10 @@
         <var-decl name='time' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='avoid_paste' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='eof' type-id='type-id-276' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <var-decl name='deps' type-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
@@ -6035,9 +6035,9 @@
         <var-decl name='forced_token_location_p' type-id='type-id-117' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-312'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-341'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='ntargets' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -6046,7 +6046,7 @@
         <var-decl name='targets_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='depv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='ndeps' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -6055,7 +6055,7 @@
         <var-decl name='deps_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='38' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='vpathv' type-id='type-id-338' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-328' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='vpathlv' type-id='type-id-211' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
@@ -6067,7 +6067,7 @@
         <var-decl name='vpaths_size' type-id='type-id-13' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_buffer' type-id='type-id-309' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-419'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-338' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-419'/>
     <typedef-decl name='_cpp_line_note' type-id='type-id-384' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-374'/>
     <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-384'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -6097,23 +6097,23 @@
         <var-decl name='canonical_name' type-id='type-id-51' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='571' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='name_map' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='construct' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ino' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='dev' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-340'/>
-    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-341'/>
+    <typedef-decl name='ino_t' type-id='type-id-64' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-330'/>
+    <typedef-decl name='dev_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-331'/>
     <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-294'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cd' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
@@ -6122,7 +6122,7 @@
         <var-decl name='width' type-id='type-id-18' visibility='default' filepath='../.././libcpp/internal.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-345'/>
+    <typedef-decl name='convert_f' type-id='type-id-362' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-335'/>
     <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='in_directive' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -6167,15 +6167,15 @@
         <var-decl name='pragma_allow_expansion' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='271' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-314'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-343'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-58' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='entries' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='alloc_node' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='alloc_subobject' type-id='type-id-213' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
@@ -6222,17 +6222,17 @@
         <var-decl name='prev' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='base' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-164' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-163' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-300'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-342'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-332'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-343' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <var-decl name='missing_files' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -6252,7 +6252,7 @@
         <var-decl name='tabstop' type-id='type-id-13' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lang' type-id='type-id-344' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='cplusplus' type-id='type-id-27' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -6378,7 +6378,7 @@
         <var-decl name='input_charset' type-id='type-id-15' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-276' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <var-decl name='warn_invalid_pch' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -6387,7 +6387,7 @@
         <var-decl name='restore_pch_deps' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='deps' type-id='type-id-342' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <var-decl name='precision' type-id='type-id-32' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -6417,35 +6417,35 @@
         <var-decl name='directives_only' type-id='type-id-1' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-315'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-344'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='value' type-id='type-id-360' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-355' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='loc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/expr.c' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='op' type-id='type-id-181' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-178' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-284'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-331'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-321'>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-332'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-322'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='last' type-id='type-id-333' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-323' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-334'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-324'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
@@ -6455,17 +6455,17 @@
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-332' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-322' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-334' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-324' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-335'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-325'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-336' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-326' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -6479,19 +6479,19 @@
         <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='u' type-id='type-id-331' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-321' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='buff' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='c' type-id='type-id-335' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-325' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tokens_kind' type-id='type-id-337' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-327' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-333'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-323'>
       <data-member access='private'>
         <var-decl name='token' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
@@ -6499,8 +6499,8 @@
         <var-decl name='ptoken' type-id='type-id-364' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-355'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-355' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
+    <typedef-decl name='macro_context' type-id='type-id-382' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-361'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-361' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-382'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-116' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -6513,67 +6513,67 @@
     </class-decl>
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-297'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file_change' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='dir_change' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='include' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ident' type-id='type-id-322' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='def_pragma' type-id='type-id-323' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='valid_pch' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='read_pch' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='missing_header' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='macro_to_expand' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='error' type-id='type-id-328' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='used_define' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='used_undef' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='before_define' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='used' type-id='type-id-321' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='user_builtin_macro' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-320' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-337'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-327'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-309'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-338'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='cur' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
@@ -6590,7 +6590,7 @@
         <var-decl name='rlimit' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='notes' type-id='type-id-356' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-351' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='cur_note' type-id='type-id-13' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -6611,7 +6611,7 @@
         <var-decl name='timestamp' type-id='type-id-145' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='if_stack' type-id='type-id-357' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <var-decl name='need_line' type-id='type-id-1' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -6637,18 +6637,18 @@
     </class-decl>
     <typedef-decl name='tokenrun' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-292'/>
     <typedef-decl name='cpp_reader' type-id='type-id-278' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-271'/>
-    <typedef-decl name='cpp_string' type-id='type-id-179' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-326'/>
+    <typedef-decl name='cpp_string' type-id='type-id-176' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-272'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-363' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-316'/>
     <typedef-decl name='cpp_dir' type-id='type-id-288' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-421'/>
     <typedef-decl name='hashnode' type-id='type-id-386' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-378'/>
-    <typedef-decl name='hash_table' type-id='type-id-314' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-343'>
+    <typedef-decl name='hash_table' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-413'/>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-333'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-344'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-334'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -6663,7 +6663,7 @@
       <enumerator name='CLK_CXX11' value='10'/>
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-276'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -6687,7 +6687,7 @@
     <typedef-decl name='cpp_comment_table' type-id='type-id-347' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-303'/>
     <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-303' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-18' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -6705,7 +6705,7 @@
         <var-decl name='sloc' type-id='type-id-103' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-311'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-340'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
@@ -6769,66 +6769,66 @@
     <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-283'/>
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-425'/>
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-351'/>
     <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-427'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-328'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-349' size-in-bits='64' id='type-id-318'/>
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-362'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-329'/>
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-338'/>
-    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-357' const='yes' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-291'/>
     <qualified-type-def type-id='type-id-155' const='yes' id='type-id-428'/>
     <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
     <qualified-type-def type-id='type-id-272' const='yes' id='type-id-268'/>
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-261'/>
-    <qualified-type-def type-id='type-id-276' const='yes' id='type-id-269'/>
+    <qualified-type-def type-id='type-id-277' const='yes' id='type-id-269'/>
     <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-263'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-364'/>
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-286'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-286'/>
     <qualified-type-def type-id='type-id-422' const='yes' id='type-id-430'/>
     <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
     <qualified-type-def type-id='type-id-423' const='yes' id='type-id-432'/>
     <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-433'/>
     <qualified-type-def type-id='type-id-275' const='yes' id='type-id-270'/>
     <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-256'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-356'/>
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
     <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-287'/>
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-434'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-317'/>
     <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-258'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-290'/>
     <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-358'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-353'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-298'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-357'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-296'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-352'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-299'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-296'/>
     <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-435'/>
     <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-436'/>
     <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-354'/>
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-280'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-321'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-311'/>
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
       <parameter type-id='type-id-258' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <parameter type-id='type-id-116' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
@@ -6922,7 +6922,7 @@
     <var-decl name='num_macro_tokens_counter' type-id='type-id-13' mangled-name='num_macro_tokens_counter' visibility='default' filepath='../.././libcpp/macro.c' line='173' column='1' elf-symbol-id='num_macro_tokens_counter'/>
     <function-decl name='_cpp_temp_token' mangled-name='_cpp_temp_token' filepath='../.././libcpp/internal.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_temp_token'>
       <parameter type-id='type-id-258'/>
-      <return type-id='type-id-164'/>
+      <return type-id='type-id-163'/>
     </function-decl>
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
       <parameter type-id='type-id-258'/>
@@ -6932,7 +6932,7 @@
     </function-decl>
     <function-decl name='_cpp_lex_direct' mangled-name='_cpp_lex_direct' filepath='../.././libcpp/internal.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_direct'>
       <parameter type-id='type-id-258'/>
-      <return type-id='type-id-164'/>
+      <return type-id='type-id-163'/>
     </function-decl>
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-435'/>
@@ -7028,6 +7028,7 @@
       <parameter type-id='type-id-280'/>
       <return type-id='type-id-280'/>
     </function-decl>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
     <function-type size-in-bits='64' id='type-id-348'>
       <parameter type-id='type-id-258'/>
       <parameter type-id='type-id-116'/>
@@ -7061,12 +7062,12 @@
       <parameter type-id='type-id-434'/>
       <return type-id='type-id-15'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-353'>
+    <function-type size-in-bits='64' id='type-id-359'>
       <parameter type-id='type-id-258'/>
       <parameter type-id='type-id-263'/>
       <return type-id='type-id-116'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-354'>
+    <function-type size-in-bits='64' id='type-id-360'>
       <parameter type-id='type-id-258'/>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-18'/>
@@ -7129,10 +7130,9 @@
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-31'/>
     </function-type>
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-426'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-312' const='yes' id='type-id-437'/>
+    <qualified-type-def type-id='type-id-341' const='yes' id='type-id-437'/>
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-438'/>
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/mkdeps.c' line='168' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
       <return type-id='type-id-295'/>
@@ -7223,7 +7223,7 @@
     </function-decl>
     <function-decl name='ht_load' mangled-name='_Z7ht_loadP2htPP13ht_identifierjjb' filepath='../.././libcpp/symtab.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z7ht_loadP2htPP13ht_identifierjjb'>
       <parameter type-id='type-id-412' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
-      <parameter type-id='type-id-358' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-353' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <parameter type-id='type-id-13' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-13' name='nelements' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-1' name='own' filepath='../.././libcpp/symtab.c' line='264' column='1'/>
@@ -8167,46 +8167,46 @@
         <var-decl name='system_microseconds' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-158'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-159'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='open_read' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='open_write' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-165' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='exec_child' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-166' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='close' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-167' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='wait' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-168' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='pipe' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-169' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='fdopenr' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='fdopenw' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-170' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='cleanup' type-id='type-id-172' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-171' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-171'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-170'/>
+    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-153'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-148'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-169'/>
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-147'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-171'/>
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <parameter type-id='type-id-18' name='flags' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <parameter type-id='type-id-15' name='pname' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
@@ -8253,18 +8253,18 @@
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-89'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-174'>
+    <function-type size-in-bits='64' id='type-id-179'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-18'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-175'>
+    <function-type size-in-bits='64' id='type-id-180'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-18'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-176'>
+    <function-type size-in-bits='64' id='type-id-181'>
       <parameter type-id='type-id-131'/>
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-18'/>
@@ -8280,7 +8280,7 @@
       <parameter type-id='type-id-18'/>
       <parameter type-id='type-id-18'/>
       <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-338'/>
+      <parameter type-id='type-id-328'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-157'/>
     </function-type>
@@ -8290,7 +8290,7 @@
       <parameter type-id='type-id-42'/>
       <parameter type-id='type-id-147'/>
       <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-338'/>
+      <parameter type-id='type-id-328'/>
       <parameter type-id='type-id-42'/>
       <return type-id='type-id-157'/>
     </function-type>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 1ad996a5..a13d268e 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -4665,7 +4665,6 @@
       <subrange length='40' type-id='type-id-106' id='type-id-107'/>
     </array-type-def>
     <typedef-decl name='__pthread_list_t' type-id='type-id-108' filepath='/usr/include/bits/pthreadtypes.h' line='65' column='1' id='type-id-104'/>
-    <type-decl name='sizetype' size-in-bits='64' id='type-id-106'/>
     <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='61' column='1' id='type-id-108'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__prev' type-id='type-id-109' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='63' column='1'/>
@@ -4674,6 +4673,7 @@
         <var-decl name='__next' type-id='type-id-109' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='64' column='1'/>
       </data-member>
     </class-decl>
+    <type-decl name='sizetype' size-in-bits='64' id='type-id-106'/>
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
@@ -6445,10 +6445,6 @@
       <parameter type-id='type-id-282'/>
       <return type-id='type-id-99'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-272'/>
-    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-282'/>
-    <type-decl name='double' size-in-bits='64' id='type-id-281'/>
     <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-262'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-6' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -6484,6 +6480,10 @@
         <var-decl name='tm_zone' type-id='type-id-4' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
+    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-272'/>
+    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-282'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-281'/>
     <qualified-type-def type-id='type-id-262' const='yes' id='type-id-283'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
@@ -10268,24 +10268,6 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-388'/>
-    <qualified-type-def type-id='type-id-322' const='yes' id='type-id-385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-324' size-in-bits='64' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-395'/>
-    <type-decl name='float' size-in-bits='32' id='type-id-411'/>
-    <function-type size-in-bits='64' id='type-id-363'>
-      <parameter type-id='type-id-18'/>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-101'>
-      <return type-id='type-id-5'/>
-    </function-type>
-    <type-decl name='long double' size-in-bits='128' id='type-id-412'/>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-286'/>
-    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-410'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-386'/>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <class-decl name='time_point&lt;std::chrono::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='523' column='1' id='type-id-405'>
@@ -10316,6 +10298,24 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-502'/>
       </class-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-312'/>
+    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-388'/>
+    <qualified-type-def type-id='type-id-322' const='yes' id='type-id-385'/>
+    <reference-type-def kind='lvalue' type-id='type-id-324' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-395'/>
+    <type-decl name='float' size-in-bits='32' id='type-id-411'/>
+    <function-type size-in-bits='64' id='type-id-363'>
+      <parameter type-id='type-id-18'/>
+      <parameter type-id='type-id-18'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-101'>
+      <return type-id='type-id-5'/>
+    </function-type>
+    <type-decl name='long double' size-in-bits='128' id='type-id-412'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-286'/>
+    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-410'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-386'/>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <typedef-decl name='microseconds' type-id='type-id-499' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='507' column='1' id='type-id-403'/>
@@ -10386,6 +10386,9 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cpp_type_traits.h' line='84' column='1' id='type-id-455'/>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='89' column='1' id='type-id-434'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-520'/>
@@ -10521,41 +10524,97 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='100' column='1' id='type-id-502'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-459'/>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <namespace-decl name='chrono'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-499'>
+          <member-type access='public'>
+            <typedef-decl name='rep' type-id='type-id-32' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-528'/>
+          </member-type>
+          <data-member access='private' layout-offset-in-bits='0'>
+            <var-decl name='__r' type-id='type-id-528' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
+          </data-member>
+          <member-function access='public'>
+            <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <return type-id='type-id-5'/>
+            </function-decl>
+          </member-function>
+          <member-function access='public'>
+            <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-530'/>
+              <return type-id='type-id-5'/>
+            </function-decl>
+          </member-function>
+          <member-function access='public' destructor='yes'>
+            <function-decl name='~duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-6' is-artificial='yes'/>
+              <return type-id='type-id-5'/>
+            </function-decl>
+          </member-function>
+          <member-function access='public'>
+            <function-decl name='duration&lt;long int, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-531'/>
+              <return type-id='type-id-5'/>
+            </function-decl>
+          </member-function>
+          <member-function access='public'>
+            <function-decl name='duration&lt;long int, std::ratio&lt;1l&gt;, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-532'/>
+              <return type-id='type-id-5'/>
+            </function-decl>
+          </member-function>
+        </class-decl>
+      </namespace-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='96' column='1' id='type-id-459'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-449'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-528'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-293' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-529'/>
+          <typedef-decl name='iterator_type' type-id='type-id-293' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-535'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-531' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-530'/>
+          <typedef-decl name='difference_type' type-id='type-id-537' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-536'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-533' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-532'/>
+          <typedef-decl name='pointer' type-id='type-id-539' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-538'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-535' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-534'/>
+          <typedef-decl name='reference' type-id='type-id-541' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-540'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
-            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-535'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
-            <parameter type-id='type-id-537'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-543'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -10563,39 +10622,39 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-447'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-538'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-544'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-445' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-539'/>
+          <typedef-decl name='iterator_type' type-id='type-id-445' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-545'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-541' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-540'/>
+          <typedef-decl name='difference_type' type-id='type-id-547' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-546'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-543' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-542'/>
+          <typedef-decl name='pointer' type-id='type-id-549' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-548'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-545' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-544'/>
+          <typedef-decl name='reference' type-id='type-id-551' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-550'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-445' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
-            <parameter type-id='type-id-539'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
+            <parameter type-id='type-id-545'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
-            <parameter type-id='type-id-547'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
+            <parameter type-id='type-id-553'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -10603,39 +10662,39 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-488'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-548'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-554'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-549'/>
+          <typedef-decl name='iterator_type' type-id='type-id-486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-555'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-551' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-550'/>
+          <typedef-decl name='difference_type' type-id='type-id-557' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-556'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-553' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-552'/>
+          <typedef-decl name='pointer' type-id='type-id-559' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-558'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-555' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-554'/>
+          <typedef-decl name='reference' type-id='type-id-561' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-560'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-486' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <parameter type-id='type-id-549'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-555'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <parameter type-id='type-id-557'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-563'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -10643,59 +10702,59 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-490'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-558'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-564'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-296' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-559'/>
+          <typedef-decl name='iterator_type' type-id='type-id-296' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-565'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-561' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-560'/>
+          <typedef-decl name='difference_type' type-id='type-id-567' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-566'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-563' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-562'/>
+          <typedef-decl name='pointer' type-id='type-id-569' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-568'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-565' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-564'/>
+          <typedef-decl name='reference' type-id='type-id-571' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-570'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-296' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-559'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-565'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-567'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-573'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <qualified-type-def type-id='type-id-436' id='type-id-431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-568' size-in-bits='64' id='type-id-436'/>
+    <reference-type-def kind='lvalue' type-id='type-id-574' size-in-bits='64' id='type-id-436'/>
     <qualified-type-def type-id='type-id-477' id='type-id-472'/>
-    <reference-type-def kind='lvalue' type-id='type-id-569' size-in-bits='64' id='type-id-477'/>
-    <reference-type-def kind='lvalue' type-id='type-id-570' size-in-bits='64' id='type-id-452'/>
+    <reference-type-def kind='lvalue' type-id='type-id-575' size-in-bits='64' id='type-id-477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-452'/>
     <qualified-type-def type-id='type-id-452' id='type-id-458'/>
-    <qualified-type-def type-id='type-id-571' const='yes' id='type-id-453'/>
-    <qualified-type-def type-id='type-id-572' const='yes' id='type-id-430'/>
+    <qualified-type-def type-id='type-id-577' const='yes' id='type-id-453'/>
+    <qualified-type-def type-id='type-id-578' const='yes' id='type-id-430'/>
     <qualified-type-def type-id='type-id-428' const='yes' id='type-id-425'/>
-    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-492'/>
+    <reference-type-def kind='lvalue' type-id='type-id-579' size-in-bits='64' id='type-id-492'/>
     <qualified-type-def type-id='type-id-492' id='type-id-497'/>
-    <qualified-type-def type-id='type-id-574' const='yes' id='type-id-493'/>
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-471'/>
+    <qualified-type-def type-id='type-id-580' const='yes' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-471'/>
     <qualified-type-def type-id='type-id-469' const='yes' id='type-id-466'/>
-    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-501'/>
+    <reference-type-def kind='lvalue' type-id='type-id-582' size-in-bits='64' id='type-id-501'/>
     <qualified-type-def type-id='type-id-409' const='yes' id='type-id-467'/>
     <reference-type-def kind='lvalue' type-id='type-id-399' size-in-bits='64' id='type-id-454'/>
     <qualified-type-def type-id='type-id-454' id='type-id-457'/>
@@ -10714,65 +10773,6 @@
     <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-473'/>
     <qualified-type-def type-id='type-id-473' const='yes' id='type-id-468'/>
     <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-500'/>
-    <namespace-decl name='std'>
-      <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cpp_type_traits.h' line='84' column='1' id='type-id-455'/>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='100' column='1' id='type-id-502'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-459'/>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <namespace-decl name='chrono'>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-499'>
-          <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-32' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-577'/>
-          </member-type>
-          <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-577' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
-          </data-member>
-          <member-function access='public'>
-            <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <return type-id='type-id-5'/>
-            </function-decl>
-          </member-function>
-          <member-function access='public'>
-            <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-579'/>
-              <return type-id='type-id-5'/>
-            </function-decl>
-          </member-function>
-          <member-function access='public' destructor='yes'>
-            <function-decl name='~duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-6' is-artificial='yes'/>
-              <return type-id='type-id-5'/>
-            </function-decl>
-          </member-function>
-          <member-function access='public'>
-            <function-decl name='duration&lt;long int, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-580'/>
-              <return type-id='type-id-5'/>
-            </function-decl>
-          </member-function>
-          <member-function access='public'>
-            <function-decl name='duration&lt;long int, std::ratio&lt;1l&gt;, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-581'/>
-              <return type-id='type-id-5'/>
-            </function-decl>
-          </member-function>
-        </class-decl>
-      </namespace-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='96' column='1' id='type-id-459'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-582'/>
-      </class-decl>
-    </namespace-decl>
     <typedef-decl name='_Atomic_word' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/atomic_word.h' line='32' column='1' id='type-id-450'/>
     <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='infinite' id='type-id-426'>
       <subrange length='infinite' id='type-id-583'/>
@@ -10858,129 +10858,129 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-14' size-in-bits='64' id='type-id-522'/>
-    <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-580'/>
-    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-568'/>
-    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-569'/>
-    <qualified-type-def type-id='type-id-399' const='yes' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-599' size-in-bits='64' id='type-id-572'/>
-    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-573'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-574'/>
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-575'/>
-    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-579'/>
-    <reference-type-def kind='lvalue' type-id='type-id-602' size-in-bits='64' id='type-id-581'/>
-    <qualified-type-def type-id='type-id-498' const='yes' id='type-id-576'/>
-    <reference-type-def kind='lvalue' type-id='type-id-603' size-in-bits='64' id='type-id-537'/>
-    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-547'/>
-    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-557'/>
-    <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-567'/>
-    <reference-type-def kind='lvalue' type-id='type-id-467' size-in-bits='64' id='type-id-526'/>
-    <reference-type-def kind='lvalue' type-id='type-id-607' size-in-bits='64' id='type-id-519'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-523'/>
-    <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-527'/>
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-578'/>
-    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-536'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-546'/>
-    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-556'/>
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-566'/>
     <namespace-decl name='std'>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='90' column='1' id='type-id-582'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='90' column='1' id='type-id-533'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-528'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-534'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, const char*, const char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-538'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, const char*, const char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-544'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, const wchar_t*, const wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-548'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, const wchar_t*, const wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-554'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, wchar_t*, wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-558'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, wchar_t*, wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-564'/>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-14' size-in-bits='64' id='type-id-522'/>
+    <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-511'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-531'/>
+    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-574'/>
+    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-575'/>
+    <qualified-type-def type-id='type-id-399' const='yes' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-599' size-in-bits='64' id='type-id-578'/>
+    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-579'/>
+    <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-581'/>
+    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-530'/>
+    <reference-type-def kind='lvalue' type-id='type-id-602' size-in-bits='64' id='type-id-532'/>
+    <qualified-type-def type-id='type-id-498' const='yes' id='type-id-582'/>
+    <reference-type-def kind='lvalue' type-id='type-id-603' size-in-bits='64' id='type-id-543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-563'/>
+    <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-467' size-in-bits='64' id='type-id-526'/>
+    <reference-type-def kind='lvalue' type-id='type-id-607' size-in-bits='64' id='type-id-519'/>
+    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-552'/>
+    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-572'/>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-608'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-304' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-531'/>
+          <typedef-decl name='difference_type' type-id='type-id-304' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-537'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-608'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-533'/>
+          <typedef-decl name='pointer' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-539'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-608'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-414' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-535'/>
+          <typedef-decl name='reference' type-id='type-id-414' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-541'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-609'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-504' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-541'/>
+          <typedef-decl name='difference_type' type-id='type-id-504' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-547'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-609'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-508' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-543'/>
+          <typedef-decl name='pointer' type-id='type-id-508' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-549'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-609'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-545'/>
+          <typedef-decl name='reference' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-551'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-610'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-551'/>
+          <typedef-decl name='difference_type' type-id='type-id-512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-557'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-610'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-553'/>
+          <typedef-decl name='pointer' type-id='type-id-516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-559'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-610'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-555'/>
+          <typedef-decl name='reference' type-id='type-id-514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-561'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-611'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-309' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-561'/>
+          <typedef-decl name='difference_type' type-id='type-id-309' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-567'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-611'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-418' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-563'/>
+          <typedef-decl name='pointer' type-id='type-id-418' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-569'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-611'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-417' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-565'/>
+          <typedef-decl name='reference' type-id='type-id-417' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-571'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -11040,8 +11040,6 @@
     <qualified-type-def type-id='type-id-488' const='yes' id='type-id-605'/>
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-606'/>
     <qualified-type-def type-id='type-id-395' const='yes' id='type-id-607'/>
-    <qualified-type-def type-id='type-id-520' const='yes' id='type-id-614'/>
-    <qualified-type-def type-id='type-id-524' const='yes' id='type-id-615'/>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-616'>
@@ -11060,7 +11058,7 @@
           <member-function access='public'>
             <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-618' is-artificial='yes'/>
-              <parameter type-id='type-id-581'/>
+              <parameter type-id='type-id-532'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -11074,13 +11072,15 @@
           <member-function access='public'>
             <function-decl name='duration&lt;long int, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-618' is-artificial='yes'/>
-              <parameter type-id='type-id-580'/>
+              <parameter type-id='type-id-531'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-520' const='yes' id='type-id-614'/>
+    <qualified-type-def type-id='type-id-524' const='yes' id='type-id-615'/>
     <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-618'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
@@ -12674,57 +12674,22 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='shared_ptr&lt;std::__future_base::_State_base&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='93' column='1' id='type-id-879'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
-        <member-function access='private'>
-          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <parameter type-id='type-id-897'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-898' size-in-bits='64' id='type-id-885'/>
-    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-888'/>
-    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-881'/>
-    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-886'/>
-    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-889'/>
-    <reference-type-def kind='lvalue' type-id='type-id-901' size-in-bits='64' id='type-id-884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-877' size-in-bits='64' id='type-id-880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-887'/>
-    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-883'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-891'/>
     <namespace-decl name='std'>
       <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-882'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-903'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-904'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-895'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-903' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-905'/>
+          <typedef-decl name='_Inherited' type-id='type-id-894' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-896'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
             <parameter type-id='type-id-884'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
@@ -12732,167 +12697,84 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
-            <parameter type-id='type-id-907'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
+            <parameter type-id='type-id-898'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
-            <parameter type-id='type-id-908'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
+            <parameter type-id='type-id-899'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <typedef-decl name='pthread_cond_t' type-id='type-id-909' filepath='/usr/include/bits/pthreadtypes.h' line='130' column='1' id='type-id-892'/>
     <namespace-decl name='std'>
-      <class-decl name='remove_reference&lt;std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1326' column='1' id='type-id-910'>
-        <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-788' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-890'/>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-894'>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-749' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1061' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-678' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1062' column='1'/>
-        </data-member>
+      <class-decl name='shared_ptr&lt;std::__future_base::_State_base&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='93' column='1' id='type-id-879'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-900'/>
         <member-function access='private'>
-          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
+          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
-            <parameter type-id='type-id-912'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
-            <parameter type-id='type-id-6' is-artificial='yes'/>
+          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
+            <parameter type-id='type-id-902'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
-            <parameter type-id='type-id-913'/>
+          <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
+            <parameter type-id='type-id-903'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-885'/>
+    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-888'/>
+    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-881'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-886'/>
+    <qualified-type-def type-id='type-id-796' const='yes' id='type-id-889'/>
+    <reference-type-def kind='lvalue' type-id='type-id-907' size-in-bits='64' id='type-id-884'/>
+    <reference-type-def kind='lvalue' type-id='type-id-877' size-in-bits='64' id='type-id-880'/>
+    <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-887'/>
+    <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-891'/>
+    <typedef-decl name='pthread_cond_t' type-id='type-id-909' filepath='/usr/include/bits/pthreadtypes.h' line='130' column='1' id='type-id-892'/>
     <namespace-decl name='std'>
-      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='467' column='1' id='type-id-902'>
-        <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='470' column='1' id='type-id-914'/>
+      <class-decl name='remove_reference&lt;std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1326' column='1' id='type-id-910'>
+        <member-type access='public'>
+          <typedef-decl name='type' type-id='type-id-788' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-890'/>
         </member-type>
-        <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_device' type-id='type-id-915' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='636' column='1'/>
-        </data-member>
-        <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_owns' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='637' column='1'/>
-        </data-member>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
-            <parameter type-id='type-id-810'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
-            <parameter type-id='type-id-811'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
-            <parameter type-id='type-id-269'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private' destructor='yes'>
-          <function-decl name='~unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-6' is-artificial='yes'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-918'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
-        <member-function access='private'>
-          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-891'/>
-            <return type-id='type-id-5'/>
-          </function-decl>
-        </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-907'/>
-    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-898'/>
-    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-899'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-896'/>
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-900'/>
-    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-908'/>
-    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-906'/>
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-901'/>
-    <reference-type-def kind='lvalue' type-id='type-id-879' size-in-bits='64' id='type-id-897'/>
-    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-895'/>
     <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-904'>
+      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <parameter type-id='type-id-884'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <parameter type-id='type-id-805'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -12900,41 +12782,159 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-903'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-894'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-742'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-922'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-912'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-742' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-923'/>
+          <typedef-decl name='_Inherited' type-id='type-id-742' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-913'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
-            <parameter type-id='type-id-925'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
+            <parameter type-id='type-id-915'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
-            <parameter type-id='type-id-926'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
+            <parameter type-id='type-id-916'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-900'>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='_M_ptr' type-id='type-id-749' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1061' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='64'>
+          <var-decl name='_M_refcount' type-id='type-id-678' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1062' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-918'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-6' is-artificial='yes'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-919'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='467' column='1' id='type-id-908'>
+        <member-type access='private'>
+          <typedef-decl name='mutex_type' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='470' column='1' id='type-id-920'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='_M_device' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='636' column='1'/>
+        </data-member>
+        <data-member access='private' layout-offset-in-bits='64'>
+          <var-decl name='_M_owns' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='637' column='1'/>
+        </data-member>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
+            <parameter type-id='type-id-810'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
+            <parameter type-id='type-id-811'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
+            <parameter type-id='type-id-269'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private' destructor='yes'>
+          <function-decl name='~unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-6' is-artificial='yes'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-924'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+        <member-function access='private'>
+          <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-891'/>
+            <return type-id='type-id-5'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-898'/>
+    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-904'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-905'/>
+    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-902'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-906'/>
+    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-899'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-897'/>
+    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-907'/>
+    <reference-type-def kind='lvalue' type-id='type-id-879' size-in-bits='64' id='type-id-903'/>
+    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-901'/>
     <union-decl name='__anonymous_union__1' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='116' column='1' id='type-id-909'>
       <member-type access='private'>
         <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='118' column='1' id='type-id-927'>
@@ -12977,48 +12977,48 @@
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='384' id='type-id-928'>
       <subrange length='48' type-id='type-id-106' id='type-id-929'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-919'/>
-    <reference-type-def kind='lvalue' type-id='type-id-930' size-in-bits='64' id='type-id-925'/>
-    <reference-type-def kind='lvalue' type-id='type-id-931' size-in-bits='64' id='type-id-912'/>
-    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-920'/>
-    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-918'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-921'/>
-    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-926'/>
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-924'/>
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-911'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-916'/>
-    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-917'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
     <namespace-decl name='std'>
-      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-922'>
+      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-912'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <parameter type-id='type-id-805'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-930'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-925'/>
+    <reference-type-def kind='lvalue' type-id='type-id-931' size-in-bits='64' id='type-id-915'/>
+    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-926'/>
+    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-911'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-914'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-919'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-917'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-922'/>
+    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-923'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-921'/>
     <qualified-type-def type-id='type-id-894' const='yes' id='type-id-931'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-932'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-932'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-930'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
   </abi-instr>
@@ -13605,16 +13605,16 @@
     <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-982'/>
     <qualified-type-def type-id='type-id-6' const='yes' id='type-id-312'/>
     <qualified-type-def type-id='type-id-32' const='yes' id='type-id-275'/>
-    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-580'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-531'/>
     <qualified-type-def type-id='type-id-960' const='yes' id='type-id-983'/>
     <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
     <qualified-type-def type-id='type-id-955' const='yes' id='type-id-985'/>
     <qualified-type-def type-id='type-id-986' const='yes' id='type-id-987'/>
     <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
-    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-568' size-in-bits='64' id='type-id-436'/>
-    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-569' size-in-bits='64' id='type-id-477'/>
+    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-574' size-in-bits='64' id='type-id-436'/>
+    <qualified-type-def type-id='type-id-475' const='yes' id='type-id-575'/>
+    <reference-type-def kind='lvalue' type-id='type-id-575' size-in-bits='64' id='type-id-477'/>
     <qualified-type-def type-id='type-id-989' const='yes' id='type-id-990'/>
     <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-991'/>
     <qualified-type-def type-id='type-id-991' const='yes' id='type-id-992'/>
@@ -13659,19 +13659,19 @@
     <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1046'/>
     <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1047'/>
     <qualified-type-def type-id='type-id-1047' const='yes' id='type-id-1048'/>
-    <qualified-type-def type-id='type-id-399' const='yes' id='type-id-570'/>
-    <reference-type-def kind='lvalue' type-id='type-id-570' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-571'/>
-    <qualified-type-def type-id='type-id-571' const='yes' id='type-id-453'/>
+    <qualified-type-def type-id='type-id-399' const='yes' id='type-id-576'/>
+    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
+    <qualified-type-def type-id='type-id-577' const='yes' id='type-id-453'/>
     <qualified-type-def type-id='type-id-421' const='yes' id='type-id-599'/>
-    <pointer-type-def type-id='type-id-599' size-in-bits='64' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-599' size-in-bits='64' id='type-id-578'/>
     <qualified-type-def type-id='type-id-428' const='yes' id='type-id-425'/>
-    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-573'/>
-    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-492'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-574'/>
-    <qualified-type-def type-id='type-id-574' const='yes' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-579'/>
+    <reference-type-def kind='lvalue' type-id='type-id-579' size-in-bits='64' id='type-id-492'/>
+    <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-580'/>
+    <qualified-type-def type-id='type-id-580' const='yes' id='type-id-493'/>
     <qualified-type-def type-id='type-id-462' const='yes' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-575'/>
+    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-581'/>
     <qualified-type-def type-id='type-id-469' const='yes' id='type-id-466'/>
     <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
     <qualified-type-def type-id='type-id-1051' id='type-id-1052'/>
@@ -19994,115 +19994,115 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1300'/>
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-447'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-538'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-544'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-445' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-539'/>
+          <typedef-decl name='iterator_type' type-id='type-id-445' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-545'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-541' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-540'/>
+          <typedef-decl name='difference_type' type-id='type-id-547' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-546'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-543' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-542'/>
+          <typedef-decl name='pointer' type-id='type-id-549' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-548'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-545' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-544'/>
+          <typedef-decl name='reference' type-id='type-id-551' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-550'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-445' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
-            <parameter type-id='type-id-539'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
+            <parameter type-id='type-id-545'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-546' is-artificial='yes'/>
-            <parameter type-id='type-id-547'/>
+            <parameter type-id='type-id-552' is-artificial='yes'/>
+            <parameter type-id='type-id-553'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-488'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-548'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-554'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-549'/>
+          <typedef-decl name='iterator_type' type-id='type-id-486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-555'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-551' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-550'/>
+          <typedef-decl name='difference_type' type-id='type-id-557' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-556'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-553' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-552'/>
+          <typedef-decl name='pointer' type-id='type-id-559' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-558'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-555' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-554'/>
+          <typedef-decl name='reference' type-id='type-id-561' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-560'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-486' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <parameter type-id='type-id-549'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-555'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-556' is-artificial='yes'/>
-            <parameter type-id='type-id-557'/>
+            <parameter type-id='type-id-562' is-artificial='yes'/>
+            <parameter type-id='type-id-563'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-449'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-528'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-534'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-293' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-529'/>
+          <typedef-decl name='iterator_type' type-id='type-id-293' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-535'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-531' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-530'/>
+          <typedef-decl name='difference_type' type-id='type-id-537' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-536'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-533' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-532'/>
+          <typedef-decl name='pointer' type-id='type-id-539' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-538'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-535' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-534'/>
+          <typedef-decl name='reference' type-id='type-id-541' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-540'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
-            <parameter type-id='type-id-529'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-535'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-536' is-artificial='yes'/>
-            <parameter type-id='type-id-537'/>
+            <parameter type-id='type-id-542' is-artificial='yes'/>
+            <parameter type-id='type-id-543'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20400,39 +20400,39 @@
         </member-function>
       </class-decl>
       <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='98' column='1' id='type-id-490'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-558'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-564'/>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-296' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-559'/>
+          <typedef-decl name='iterator_type' type-id='type-id-296' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='111' column='1' id='type-id-565'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-561' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-560'/>
+          <typedef-decl name='difference_type' type-id='type-id-567' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='112' column='1' id='type-id-566'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-563' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-562'/>
+          <typedef-decl name='pointer' type-id='type-id-569' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='113' column='1' id='type-id-568'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-565' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-564'/>
+          <typedef-decl name='reference' type-id='type-id-571' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='114' column='1' id='type-id-570'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='current' type-id='type-id-296' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='106' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-559'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-565'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='reverse_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-566' is-artificial='yes'/>
-            <parameter type-id='type-id-567'/>
+            <parameter type-id='type-id-572' is-artificial='yes'/>
+            <parameter type-id='type-id-573'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -20595,9 +20595,9 @@
         <return type-id='type-id-986'/>
       </function-decl>
       <function-decl name='min&lt;long int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-580'/>
-        <parameter type-id='type-id-580'/>
-        <return type-id='type-id-580'/>
+        <parameter type-id='type-id-531'/>
+        <parameter type-id='type-id-531'/>
+        <return type-id='type-id-531'/>
       </function-decl>
       <function-decl name='swap&lt;std::__detail::_List_node_baseXX*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1094'/>
@@ -21329,90 +21329,87 @@
       <parameter type-id='type-id-1141'/>
       <return type-id='type-id-6'/>
     </function-decl>
-    <array-type-def dimensions='1' type-id='type-id-1156' size-in-bits='1024' id='type-id-1169'>
-      <subrange length='8' type-id='type-id-106' id='type-id-1329'/>
-    </array-type-def>
-    <qualified-type-def type-id='type-id-1330' id='type-id-1204'/>
+    <qualified-type-def type-id='type-id-1329' id='type-id-1204'/>
     <namespace-decl name='std'>
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='54' column='1' id='type-id-1282'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_cfile' type-id='type-id-1331' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='57' column='1'/>
+          <var-decl name='_M_cfile' type-id='type-id-1330' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='57' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_cfile_created' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='60' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__basic_file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-1332'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__basic_file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__basic_file' mangled-name='_ZNSt12__basic_fileIcEC2EP15pthread_mutex_t' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcEC2EP15pthread_mutex_t@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-1332'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt12__basic_fileIcE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12__basic_fileIcE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1333' name='this' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__name' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1'/>
             <parameter type-id='type-id-1151' name='__mode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1'/>
             <parameter type-id='type-id-6'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sys_open' mangled-name='_ZNSt12__basic_fileIcE8sys_openEiSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8sys_openEiSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-6' name='__fd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1'/>
             <parameter type-id='type-id-1151' name='__mode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='fd' mangled-name='_ZNSt12__basic_fileIcE2fdEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='file' mangled-name='_ZNSt12__basic_fileIcE4fileEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1331'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1330'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt12__basic_fileIcE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='xsgetn' mangled-name='_ZNSt12__basic_fileIcE6xsgetnEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsgetnEPcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-98' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1'/>
             <parameter type-id='type-id-1168' name='__n' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1'/>
             <return type-id='type-id-1168'/>
@@ -21420,7 +21417,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='xsputn' mangled-name='_ZNSt12__basic_fileIcE6xsputnEPKcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsputnEPKcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1'/>
             <parameter type-id='type-id-1168' name='__n' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1'/>
             <return type-id='type-id-1168'/>
@@ -21428,7 +21425,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='xsputn_2' mangled-name='_ZNSt12__basic_fileIcE8xsputn_2EPKclS2_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8xsputn_2EPKclS2_l@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__s1' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1'/>
             <parameter type-id='type-id-1168' name='__n1' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1'/>
             <parameter type-id='type-id-4' name='__s2' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='304' column='1'/>
@@ -21438,7 +21435,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='seekoff' mangled-name='_ZNSt12__basic_fileIcE7seekoffElSt12_Ios_Seekdir' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE7seekoffElSt12_Ios_Seekdir@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1275' name='__off' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1'/>
             <parameter type-id='type-id-1153' name='__way' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1'/>
             <return type-id='type-id-1275'/>
@@ -21446,21 +21443,21 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='sync' mangled-name='_ZNSt12__basic_fileIcE4syncEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sys_open' mangled-name='_ZNSt12__basic_fileIcE8sys_openEP8_IO_FILESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8sys_openEP8_IO_FILESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1331' name='__file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1330' name='__file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1'/>
             <parameter type-id='type-id-1151'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='showmanyc' mangled-name='_ZNSt12__basic_fileIcE9showmanycEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE9showmanycEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-1168'/>
           </function-decl>
         </member-function>
@@ -21468,134 +21465,134 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='codecvt&lt;char, char, __mbstate_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='341' column='1' id='type-id-1286'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1336'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1335'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='346' column='1' id='type-id-1337'/>
+          <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='346' column='1' id='type-id-1336'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='347' column='1' id='type-id-1338'/>
+          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='347' column='1' id='type-id-1337'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='348' column='1' id='type-id-1339'/>
+          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='348' column='1' id='type-id-1338'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='351' column='1'/>
+          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='351' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7codecvtIcc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='32' column='1' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7codecvtIcc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='32' column='1' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE6do_outERS0_PKcS4_RS4_PcS6_RS6_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE6do_outERS0_PKcS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1345'/>
             <parameter type-id='type-id-1345'/>
             <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1346'/>
             <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1348'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_unshift' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1346'/>
             <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1348'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE5do_inERS0_PKcS4_RS4_PcS6_RS6_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE5do_inERS0_PKcS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1350'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1349'/>
             <parameter type-id='type-id-1350'/>
             <parameter type-id='type-id-1351'/>
+            <parameter type-id='type-id-1351'/>
             <parameter type-id='type-id-1352'/>
-            <parameter type-id='type-id-1352'/>
-            <parameter type-id='type-id-1353'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_encoding' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE11do_encodingEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE11do_encodingEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_length' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE9do_lengthERS0_PKcS4_m' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE9do_lengthERS0_PKcS4_m@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1350'/>
-            <parameter type-id='type-id-1350'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1349'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_max_length' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE13do_max_lengthEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE13do_max_lengthEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -21603,160 +21600,160 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='399' column='1' id='type-id-1306'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1354'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1353'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='404' column='1' id='type-id-1355'/>
+          <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='404' column='1' id='type-id-1354'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='405' column='1' id='type-id-1356'/>
+          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='405' column='1' id='type-id-1355'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='406' column='1' id='type-id-1357'/>
+          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='406' column='1' id='type-id-1356'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='409' column='1'/>
+          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='409' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7codecvtIwc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='35' column='1' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7codecvtIwc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='35' column='1' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1360'/>
             <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/codecvt_members.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1360'/>
             <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_unshift' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1363'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-1366'/>
             <parameter type-id='type-id-1367'/>
+            <parameter type-id='type-id-1367'/>
             <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1369'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/codecvt_members.cc' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-1366'/>
             <parameter type-id='type-id-1367'/>
+            <parameter type-id='type-id-1367'/>
             <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1369'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_encoding' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE11do_encodingEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE11do_encodingEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_length' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE9do_lengthERS0_PKcS4_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE9do_lengthERS0_PKcS4_m@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_max_length' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE13do_max_lengthEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE13do_max_lengthEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
@@ -21764,48 +21761,48 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='ctype&lt;char&gt;' size-in-bits='4608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='676' column='1' id='type-id-1177'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1371'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='681' column='1' id='type-id-1372'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='681' column='1' id='type-id-1371'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='685' column='1'/>
+          <var-decl name='_M_c_locale_ctype' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='685' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_del' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
-          <var-decl name='_M_toupper' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='687' column='1'/>
+          <var-decl name='_M_toupper' type-id='type-id-1372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='687' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='320'>
-          <var-decl name='_M_tolower' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='688' column='1'/>
+          <var-decl name='_M_tolower' type-id='type-id-1372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='688' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='384'>
-          <var-decl name='_M_table' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='689' column='1'/>
+          <var-decl name='_M_table' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='689' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='448'>
           <var-decl name='_M_widen_ok' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='690' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='456'>
-          <var-decl name='_M_widen' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='691' column='1'/>
+          <var-decl name='_M_widen' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='691' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='2504'>
-          <var-decl name='_M_narrow' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='692' column='1'/>
+          <var-decl name='_M_narrow' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='692' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='4552'>
           <var-decl name='_M_narrow_ok' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='693' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt5ctypeIcE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='47' column='1' elf-symbol-id='_ZNSt5ctypeIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt5ctypeIcE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='47' column='1' elf-symbol-id='_ZNSt5ctypeIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='table_size' type-id='type-id-1376' mangled-name='_ZNSt5ctypeIcE10table_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='700' column='1' elf-symbol-id='_ZNSt5ctypeIcE10table_sizeE@@GLIBCXX_3.4'/>
+          <var-decl name='table_size' type-id='type-id-1375' mangled-name='_ZNSt5ctypeIcE10table_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='700' column='1' elf-symbol-id='_ZNSt5ctypeIcE10table_sizeE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ctype' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -21813,9 +21810,9 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -21823,26 +21820,26 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_narrow_init' mangled-name='_ZNKSt5ctypeIcE14_M_narrow_initEv' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE14_M_narrow_initEv@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-1378' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1377' name='this' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_widen_init' mangled-name='_ZNKSt5ctypeIcE13_M_widen_initEv' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE13_M_widen_initEv@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-1378' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1377' name='this' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='classic_table' mangled-name='_ZNSt5ctypeIcE13classic_tableEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcE13classic_tableEv@@GLIBCXX_3.4'>
-            <return type-id='type-id-1374'/>
+            <return type-id='type-id-1373'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EP15__locale_structPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC2EP15__locale_structPKtbm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -21850,8 +21847,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC1EPKtbm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -21859,50 +21856,50 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1007' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
-            <return type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1024' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1379'/>
             <parameter type-id='type-id-1380'/>
-            <parameter type-id='type-id-1381'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-98'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
@@ -21910,29 +21907,29 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1040' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
-            <return type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1057' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1379'/>
             <parameter type-id='type-id-1380'/>
-            <parameter type-id='type-id-1381'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-98'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
@@ -21940,182 +21937,182 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIcE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE8do_widenEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1372'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIcE8do_widenEPKcS2_Pc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE8do_widenEPKcS2_Pc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1379'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIcE9do_narrowEcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE9do_narrowEcc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIcE9do_narrowEPKcS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE9do_narrowEPKcS2_cPc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1381'/>
-            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1380'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-98'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='ctype&lt;wchar_t&gt;' size-in-bits='10752' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1177' column='1' id='type-id-1233'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1382'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1381'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1182' column='1' id='type-id-1383'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1182' column='1' id='type-id-1382'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__wmask_type' type-id='type-id-964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1183' column='1' id='type-id-1384'/>
+          <typedef-decl name='__wmask_type' type-id='type-id-964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1183' column='1' id='type-id-1383'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1186' column='1'/>
+          <var-decl name='_M_c_locale_ctype' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_narrow_ok' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1189' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='200'>
-          <var-decl name='_M_narrow' type-id='type-id-1385' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1190' column='1'/>
+          <var-decl name='_M_narrow' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1190' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1248'>
-          <var-decl name='_M_widen' type-id='type-id-1386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1191' column='1'/>
+          <var-decl name='_M_widen' type-id='type-id-1385' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1191' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='9440'>
-          <var-decl name='_M_bit' type-id='type-id-1387' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1194' column='1'/>
+          <var-decl name='_M_bit' type-id='type-id-1386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1194' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='9728'>
-          <var-decl name='_M_wmask' type-id='type-id-1388' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1195' column='1'/>
+          <var-decl name='_M_wmask' type-id='type-id-1387' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1195' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt5ctypeIwE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='50' column='1' elf-symbol-id='_ZNSt5ctypeIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt5ctypeIwE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='50' column='1' elf-symbol-id='_ZNSt5ctypeIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_convert_to_wmask' mangled-name='_ZNKSt5ctypeIwE19_M_convert_to_wmaskEt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE19_M_convert_to_wmaskEt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1390' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1391' name='__m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1'/>
-            <return type-id='type-id-1384'/>
+            <parameter type-id='type-id-1389' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1390' name='__m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1'/>
+            <return type-id='type-id-1383'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_initialize_ctype' mangled-name='_ZNSt5ctypeIwE19_M_initialize_ctypeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwE19_M_initialize_ctypeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
+            <parameter type-id='type-id-1382'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEtw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1394'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-395'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -22123,47 +22120,47 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1300' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-395'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1396'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -22171,29 +22168,29 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1350' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1396'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -22201,30 +22198,30 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1387' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1383'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1396'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-368'/>
@@ -22233,15 +22230,15 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEwc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEwc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEwc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
@@ -22249,17 +22246,17 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='13'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-98'/>
-            <return type-id='type-id-1394'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='13'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-16'/>
@@ -22272,42 +22269,42 @@
     <namespace-decl name='std'>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='64' column='1' id='type-id-1170'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='306' column='1' id='type-id-1397'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='306' column='1' id='type-id-1396'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='_S_categories_size' value='12'/>
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='facet' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='340' column='1' id='type-id-1370'>
+          <class-decl name='facet' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='340' column='1' id='type-id-1369'>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='_M_refcount' type-id='type-id-450' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='346' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_c_locale' type-id='type-id-1340' mangled-name='_ZNSt6locale5facet11_S_c_localeE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='191' column='1'/>
+              <var-decl name='_S_c_locale' type-id='type-id-1339' mangled-name='_ZNSt6locale5facet11_S_c_localeE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='191' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_c_name' type-id='type-id-1398' mangled-name='_ZNSt6locale5facet9_S_c_nameE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='193' column='1'/>
+              <var-decl name='_S_c_name' type-id='type-id-1397' mangled-name='_ZNSt6locale5facet9_S_c_nameE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='193' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
               <var-decl name='_S_once' type-id='type-id-627' mangled-name='_ZNSt6locale5facet7_S_onceE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='196' column='1'/>
             </data-member>
             <member-function access='protected' constructor='yes'>
               <function-decl name='facet' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='facet' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='420' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
-                <parameter type-id='type-id-1400'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
+                <parameter type-id='type-id-1399'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_get_c_locale' mangled-name='_ZNSt6locale5facet15_S_get_c_localeEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet15_S_get_c_localeEv@@GLIBCXX_3.4'>
-                <return type-id='type-id-1340'/>
+                <return type-id='type-id-1339'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
@@ -22317,41 +22314,41 @@
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_create_c_locale' mangled-name='_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
                 <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
-                <parameter type-id='type-id-1340' name='__old' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='131' column='1'/>
+                <parameter type-id='type-id-1339' name='__old' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='131' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_destroy_c_locale' mangled-name='_ZNSt6locale5facet19_S_destroy_c_localeERP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet19_S_destroy_c_localeERP15__locale_struct@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_clone_c_locale' mangled-name='_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1'/>
-                <return type-id='type-id-1340'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1'/>
+                <return type-id='type-id-1339'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD0Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD1Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -22359,54 +22356,54 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='477' column='1' id='type-id-1402'>
+          <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='477' column='1' id='type-id-1401'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_refcount' type-id='type-id-450' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='497' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='_M_facets' type-id='type-id-1403' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='498' column='1'/>
+              <var-decl name='_M_facets' type-id='type-id-1402' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='498' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='128'>
               <var-decl name='_M_facets_size' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='499' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='192'>
-              <var-decl name='_M_caches' type-id='type-id-1403' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='500' column='1'/>
+              <var-decl name='_M_caches' type-id='type-id-1402' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='500' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='256'>
               <var-decl name='_M_names' type-id='type-id-301' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='501' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_ctype' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl11_S_id_ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='502' column='1'/>
+              <var-decl name='_S_id_ctype' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl11_S_id_ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='502' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_numeric' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl13_S_id_numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='503' column='1'/>
+              <var-decl name='_S_id_numeric' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl13_S_id_numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='503' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_collate' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl13_S_id_collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='504' column='1'/>
+              <var-decl name='_S_id_collate' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl13_S_id_collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='504' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_time' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl10_S_id_timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='505' column='1'/>
+              <var-decl name='_S_id_time' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl10_S_id_timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='505' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_monetary' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl14_S_id_monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='506' column='1'/>
+              <var-decl name='_S_id_monetary' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl14_S_id_monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='506' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_messages' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl14_S_id_messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='507' column='1'/>
+              <var-decl name='_S_id_messages' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl14_S_id_messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='507' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_facet_categories' type-id='type-id-1405' mangled-name='_ZNSt6locale5_Impl19_S_facet_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='508' column='1'/>
+              <var-decl name='_S_facet_categories' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl19_S_facet_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='508' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
@@ -22414,278 +22411,278 @@
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' destructor='yes'>
               <function-decl name='~_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' destructor='yes'>
               <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC1ERKS0_m@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_cache' mangled-name='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm@@GLIBCXX_3.4.7'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1409' name='__cache' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1408' name='__cache' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
                 <parameter type-id='type-id-96' name='__index' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_facet' mangled-name='_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1410' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
-                <parameter type-id='type-id-1409' name='__fp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1409' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
+                <parameter type-id='type-id-1408' name='__fp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_facet' mangled-name='_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
-                <parameter type-id='type-id-1410' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
+                <parameter type-id='type-id-1409' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_category' mangled-name='_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='294' column='1'/>
-                <parameter type-id='type-id-1412' name='__idpp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='295' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='294' column='1'/>
+                <parameter type-id='type-id-1411' name='__idpp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='295' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::ctype&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1377'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1376'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1342'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1341'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::numpunct&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1413'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1412'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1414'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1413'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1415'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1414'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::collate&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1416'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1415'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;char, false&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1417'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1416'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;char, true&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1418'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1417'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1419'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1418'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1420'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1419'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::__timepunct&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1421'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1420'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1422'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1421'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1423'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1422'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::messages&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1424'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1423'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1389'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1388'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1358'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1357'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::numpunct&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1425'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1424'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1426'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1425'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1427'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1426'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::collate&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1428'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1427'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;wchar_t, false&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1429'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1428'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;wchar_t, true&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1430'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1429'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1431'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1430'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1432'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1431'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::__timepunct&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1433'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1432'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1434'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1433'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1435'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1434'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::messages&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1436'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1435'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2Em@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2EPKcm@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
@@ -22693,19 +22690,19 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_categories' mangled-name='_ZNSt6locale5_Impl21_M_replace_categoriesEPKS0_i' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl21_M_replace_categoriesEPKS0_i@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
-                <parameter type-id='type-id-1437' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
+                <parameter type-id='type-id-1436' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='category' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='69' column='1' id='type-id-1437'/>
+          <typedef-decl name='category' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='69' column='1' id='type-id-1436'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='438' column='1' id='type-id-1341'>
+          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='438' column='1' id='type-id-1340'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_index' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='455' column='1'/>
             </data-member>
@@ -22714,159 +22711,159 @@
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1438' is-artificial='yes'/>
-                <parameter type-id='type-id-1439'/>
+                <parameter type-id='type-id-1437' is-artificial='yes'/>
+                <parameter type-id='type-id-1438'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1438' is-artificial='yes'/>
+                <parameter type-id='type-id-1437' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='_M_id' mangled-name='_ZNKSt6locale2id5_M_idEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale2id5_M_idEv@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1440' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1439' name='this' is-artificial='yes'/>
                 <return type-id='type-id-96'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='none' type-id='type-id-1441' mangled-name='_ZNSt6locale4noneE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='100' column='1' elf-symbol-id='_ZNSt6locale4noneE@@GLIBCXX_3.4'/>
+          <var-decl name='none' type-id='type-id-1440' mangled-name='_ZNSt6locale4noneE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='100' column='1' elf-symbol-id='_ZNSt6locale4noneE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='ctype' type-id='type-id-1441' mangled-name='_ZNSt6locale5ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='101' column='1' elf-symbol-id='_ZNSt6locale5ctypeE@@GLIBCXX_3.4'/>
+          <var-decl name='ctype' type-id='type-id-1440' mangled-name='_ZNSt6locale5ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='101' column='1' elf-symbol-id='_ZNSt6locale5ctypeE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='numeric' type-id='type-id-1441' mangled-name='_ZNSt6locale7numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='102' column='1' elf-symbol-id='_ZNSt6locale7numericE@@GLIBCXX_3.4'/>
+          <var-decl name='numeric' type-id='type-id-1440' mangled-name='_ZNSt6locale7numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='102' column='1' elf-symbol-id='_ZNSt6locale7numericE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='collate' type-id='type-id-1441' mangled-name='_ZNSt6locale7collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='103' column='1' elf-symbol-id='_ZNSt6locale7collateE@@GLIBCXX_3.4'/>
+          <var-decl name='collate' type-id='type-id-1440' mangled-name='_ZNSt6locale7collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='103' column='1' elf-symbol-id='_ZNSt6locale7collateE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='time' type-id='type-id-1441' mangled-name='_ZNSt6locale4timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='104' column='1' elf-symbol-id='_ZNSt6locale4timeE@@GLIBCXX_3.4'/>
+          <var-decl name='time' type-id='type-id-1440' mangled-name='_ZNSt6locale4timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='104' column='1' elf-symbol-id='_ZNSt6locale4timeE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='monetary' type-id='type-id-1441' mangled-name='_ZNSt6locale8monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='105' column='1' elf-symbol-id='_ZNSt6locale8monetaryE@@GLIBCXX_3.4'/>
+          <var-decl name='monetary' type-id='type-id-1440' mangled-name='_ZNSt6locale8monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='105' column='1' elf-symbol-id='_ZNSt6locale8monetaryE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='messages' type-id='type-id-1441' mangled-name='_ZNSt6locale8messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='106' column='1' elf-symbol-id='_ZNSt6locale8messagesE@@GLIBCXX_3.4'/>
+          <var-decl name='messages' type-id='type-id-1440' mangled-name='_ZNSt6locale8messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='106' column='1' elf-symbol-id='_ZNSt6locale8messagesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='all' type-id='type-id-1441' mangled-name='_ZNSt6locale3allE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='108' column='1' elf-symbol-id='_ZNSt6locale3allE@@GLIBCXX_3.4'/>
+          <var-decl name='all' type-id='type-id-1440' mangled-name='_ZNSt6locale3allE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='108' column='1' elf-symbol-id='_ZNSt6locale3allE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1406' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='282' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1405' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='282' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_classic' type-id='type-id-1406' mangled-name='_ZNSt6locale10_S_classicE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='285' column='1'/>
+          <var-decl name='_S_classic' type-id='type-id-1405' mangled-name='_ZNSt6locale10_S_classicE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='285' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_global' type-id='type-id-1406' mangled-name='_ZNSt6locale9_S_globalE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='288' column='1'/>
+          <var-decl name='_S_global' type-id='type-id-1405' mangled-name='_ZNSt6locale9_S_globalE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='288' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_categories' type-id='type-id-1442' mangled-name='_ZNSt6locale13_S_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='294' column='1'/>
+          <var-decl name='_S_categories' type-id='type-id-1441' mangled-name='_ZNSt6locale13_S_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='294' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='_S_once' type-id='type-id-627' mangled-name='_ZNSt6locale7_S_onceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='309' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-1220'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <parameter type-id='type-id-1406'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
+            <parameter type-id='type-id-1405'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPNS_5_ImplE@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <parameter type-id='type-id-1406'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
+            <parameter type-id='type-id-1405'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='name' mangled-name='_ZNKSt6locale4nameEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale4nameEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1443' name='this' is-artificial='yes'/>
             <return type-id='type-id-355'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt6localeeqERKS_' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6localeeqERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1443' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__rhs' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='94' column='1'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_normalize_category' mangled-name='_ZNSt6locale21_S_normalize_categoryEi' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale21_S_normalize_categoryEi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1437'/>
-            <return type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
+            <return type-id='type-id-1436'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt6localeaSERKS_' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeaSERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1445' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__other' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='115' column='1'/>
             <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -22878,7 +22875,7 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -22890,35 +22887,35 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_coalesce' mangled-name='_ZNSt6locale11_M_coalesceERKS_S1_i' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1445' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__base' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1'/>
             <parameter type-id='type-id-1175' name='__add' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1'/>
-            <parameter type-id='type-id-1437' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='161' column='1'/>
+            <parameter type-id='type-id-1436' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='161' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_S1_i' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_S1_i@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-1220'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_PKci@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -22926,871 +22923,871 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='num_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-1188'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1446'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1445'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1448'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1447'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1450'/>
+            <return type-id='type-id-1449'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
             <parameter type-id='type-id-1204' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
             <parameter type-id='type-id-1207' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
             <parameter type-id='type-id-1208' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
             <parameter type-id='type-id-1209' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
             <parameter type-id='type-id-1210' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;short unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_float' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <parameter type-id='type-id-1454' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <parameter type-id='type-id-1453' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1330'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1329'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
             <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1457'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1458'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1457'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1459'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1458'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1461'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1460'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1461'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1462'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1464'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1463'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1465'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='num_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-1237'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1467'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1466'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1469'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1468'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-96'/>
             <parameter type-id='type-id-409'/>
-            <return type-id='type-id-1450'/>
+            <return type-id='type-id-1449'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
             <parameter type-id='type-id-1204' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
             <parameter type-id='type-id-1207' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
             <parameter type-id='type-id-1208' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
             <parameter type-id='type-id-1209' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
             <parameter type-id='type-id-1210' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;short unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_float' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <parameter type-id='type-id-1454' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <parameter type-id='type-id-1453' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1330'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1329'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
             <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1457'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1458'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1457'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1459'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1458'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1461'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1461'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1462'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1464'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1463'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1465'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='num_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-1224'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1472'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1471'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1473'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1472'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
             <parameter type-id='type-id-10' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2339' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2349' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basece@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2402' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
             <parameter type-id='type-id-18' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2423' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-16' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
-            <parameter type-id='type-id-1452'/>
+            <parameter type-id='type-id-1451'/>
             <parameter type-id='type-id-98' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-98' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
@@ -23799,7 +23796,7 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-16' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='937' column='1'/>
@@ -23812,10 +23809,10 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_pad' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6_M_padEclRSt8ios_basePcPKcRi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6_M_padEclRSt8ios_basePcPKcRi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-1168' name='__w' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-98' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-4' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
@@ -23824,282 +23821,282 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;long double&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;double&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-10'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-32'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-410'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-281'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basece@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='num_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-1235'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1477'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1476'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1479'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1478'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
             <parameter type-id='type-id-10' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2339' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2349' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2402' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
             <parameter type-id='type-id-18' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2423' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-409' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
-            <parameter type-id='type-id-1452'/>
+            <parameter type-id='type-id-1451'/>
             <parameter type-id='type-id-368' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-368' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
@@ -24108,7 +24105,7 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-409' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='937' column='1'/>
@@ -24121,10 +24118,10 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_pad' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6_M_padEwlRSt8ios_basePwPKwRi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6_M_padEwlRSt8ios_basePwPKwRi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-1168' name='__w' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-368' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-395' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
@@ -24133,196 +24130,196 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;long double&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIeEES3_S3_RSt8ios_basewcT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIeEES3_S3_RSt8ios_basewcT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;double&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-10'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-32'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-410'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-281'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1293'/>
-    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1312'/>
-    <qualified-type-def type-id='type-id-1484' id='type-id-1230'/>
-    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1227'/>
-    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1229'/>
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1228'/>
-    <qualified-type-def type-id='type-id-1488' id='type-id-1243'/>
-    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1240'/>
-    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1242'/>
-    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1241'/>
-    <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1195'/>
-    <qualified-type-def type-id='type-id-1493' const='yes' id='type-id-1270'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1494' size-in-bits='64' id='type-id-1215'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1312'/>
+    <qualified-type-def type-id='type-id-1483' id='type-id-1230'/>
+    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1227'/>
+    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1487' id='type-id-1243'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-1240'/>
+    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1242'/>
+    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1241'/>
+    <qualified-type-def type-id='type-id-1491' const='yes' id='type-id-1195'/>
+    <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-1215' id='type-id-1218'/>
-    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1217'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1251'/>
+    <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-1217'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1495' size-in-bits='64' id='type-id-1251'/>
     <qualified-type-def type-id='type-id-1251' id='type-id-1254'/>
-    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1253'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1172'/>
-    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1253'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1497' size-in-bits='64' id='type-id-1172'/>
+    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1150'/>
     <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1164'/>
     <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1165'/>
     <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1166'/>
     <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1167'/>
     <qualified-type-def type-id='type-id-1220' id='type-id-1175'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1220'/>
-    <qualified-type-def type-id='type-id-1464' id='type-id-1208'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1220'/>
+    <qualified-type-def type-id='type-id-1463' id='type-id-1208'/>
     <namespace-decl name='std'>
       <enum-decl name='_Ios_Fmtflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='53' column='1' id='type-id-1163'>
         <underlying-type type-id='type-id-21'/>
@@ -24347,7 +24344,7 @@
         <enumerator name='_S_ios_fmtflags_end' value='65536'/>
       </enum-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1463' id='type-id-1207'/>
+    <qualified-type-def type-id='type-id-1462' id='type-id-1207'/>
     <function-type size-in-bits='64' id='type-id-972'>
       <parameter type-id='type-id-522'/>
       <parameter type-id='type-id-522'/>
@@ -24358,51 +24355,54 @@
       <parameter type-id='type-id-526'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <qualified-type-def type-id='type-id-1501' id='type-id-1198'/>
-    <qualified-type-def type-id='type-id-1465' id='type-id-1209'/>
-    <qualified-type-def type-id='type-id-1457' id='type-id-1202'/>
-    <qualified-type-def type-id='type-id-1461' id='type-id-1205'/>
-    <qualified-type-def type-id='type-id-1462' id='type-id-1206'/>
-    <qualified-type-def type-id='type-id-1502' id='type-id-1199'/>
+    <qualified-type-def type-id='type-id-1500' id='type-id-1198'/>
+    <qualified-type-def type-id='type-id-1464' id='type-id-1209'/>
+    <qualified-type-def type-id='type-id-1456' id='type-id-1202'/>
+    <qualified-type-def type-id='type-id-1460' id='type-id-1205'/>
+    <qualified-type-def type-id='type-id-1461' id='type-id-1206'/>
+    <qualified-type-def type-id='type-id-1501' id='type-id-1199'/>
     <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-1294'/>
     <qualified-type-def type-id='type-id-1294' const='yes' id='type-id-1295'/>
     <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-1297'/>
-    <qualified-type-def type-id='type-id-1503' id='type-id-1296'/>
+    <qualified-type-def type-id='type-id-1502' id='type-id-1296'/>
     <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1298'/>
     <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-1292'/>
     <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1313'/>
     <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1314'/>
     <pointer-type-def type-id='type-id-1301' size-in-bits='64' id='type-id-1316'/>
-    <qualified-type-def type-id='type-id-1504' id='type-id-1315'/>
+    <qualified-type-def type-id='type-id-1503' id='type-id-1315'/>
     <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1317'/>
     <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1311'/>
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1231'/>
     <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-1244'/>
-    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1193'/>
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-1192'/>
-    <qualified-type-def type-id='type-id-1507' id='type-id-1196'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1193'/>
+    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1192'/>
+    <qualified-type-def type-id='type-id-1506' id='type-id-1196'/>
     <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <qualified-type-def type-id='type-id-1508' id='type-id-1197'/>
+    <qualified-type-def type-id='type-id-1507' id='type-id-1197'/>
     <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1191'/>
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1269'/>
-    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1268'/>
-    <qualified-type-def type-id='type-id-1511' id='type-id-1271'/>
+    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1268'/>
+    <qualified-type-def type-id='type-id-1510' id='type-id-1271'/>
     <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1266'/>
-    <qualified-type-def type-id='type-id-1512' id='type-id-1272'/>
+    <qualified-type-def type-id='type-id-1511' id='type-id-1272'/>
     <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1267'/>
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1226'/>
-    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1239'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1226'/>
+    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1239'/>
     <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1219'/>
     <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1216'/>
     <reference-type-def kind='lvalue' type-id='type-id-1245' size-in-bits='64' id='type-id-1255'/>
     <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1252'/>
-    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1194'/>
+    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1194'/>
     <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1171'/>
     <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1173'/>
     <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
     <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
     <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1174'/>
     <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <array-type-def dimensions='1' type-id='type-id-1156' size-in-bits='1024' id='type-id-1169'>
+      <subrange length='8' type-id='type-id-106' id='type-id-1515'/>
+    </array-type-def>
     <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1149'/>
     <namespace-decl name='std'>
       <typedef-decl name='__c_lock' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='43' column='1' id='type-id-1291'/>
@@ -24416,24 +24416,24 @@
     <namespace-decl name='std'>
       <typedef-decl name='wstreampos' type-id='type-id-1516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='232' column='1' id='type-id-1278'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1459' id='type-id-1201'/>
-    <qualified-type-def type-id='type-id-1460' id='type-id-1203'/>
-    <qualified-type-def type-id='type-id-1458' id='type-id-1200'/>
+    <qualified-type-def type-id='type-id-1458' id='type-id-1201'/>
+    <qualified-type-def type-id='type-id-1459' id='type-id-1203'/>
+    <qualified-type-def type-id='type-id-1457' id='type-id-1200'/>
     <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-1146'/>
-    <qualified-type-def type-id='type-id-1466' id='type-id-1210'/>
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-1330'/>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1024' id='type-id-1385'>
+    <qualified-type-def type-id='type-id-1465' id='type-id-1210'/>
+    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-1329'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1024' id='type-id-1384'>
       <subrange length='128' type-id='type-id-106' id='type-id-1518'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-1375'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-1374'>
       <subrange length='256' type-id='type-id-106' id='type-id-1519'/>
     </array-type-def>
     <namespace-decl name='std'>
-      <class-decl name='__codecvt_abstract_base&lt;char, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1336'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__codecvt_abstract_base&lt;char, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1335'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1520'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-1349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1521'/>
+          <typedef-decl name='result' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1521'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='75' column='1' id='type-id-1522'/>
@@ -24539,11 +24539,11 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1354'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1353'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1520'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-1349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1365'/>
+          <typedef-decl name='result' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1364'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='75' column='1' id='type-id-1536'/>
@@ -24592,7 +24592,7 @@
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1545'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -24602,7 +24602,7 @@
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1545'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -24615,7 +24615,7 @@
             <parameter type-id='type-id-1548'/>
             <parameter type-id='type-id-1548'/>
             <parameter type-id='type-id-1549'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -24649,9 +24649,9 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='__ctype_abstract_base&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='145' column='1' id='type-id-1382'>
+      <class-decl name='__ctype_abstract_base&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='145' column='1' id='type-id-1381'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1371'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='150' column='1' id='type-id-1550'/>
         </member-type>
@@ -24686,7 +24686,7 @@
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1550'/>
             <return type-id='type-id-10'/>
           </function-decl>
@@ -24696,14 +24696,14 @@
             <parameter type-id='type-id-1552' is-artificial='yes'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-1553'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
             <return type-id='type-id-1553'/>
@@ -24712,7 +24712,7 @@
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt21__ctype_abstract_baseIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='430' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
             <return type-id='type-id-1553'/>
@@ -24785,7 +24785,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1513'>
+      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1512'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-1013'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-1555'>
@@ -24853,7 +24853,7 @@
           <typedef-decl name='__streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='67' column='1' id='type-id-1566'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1567'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-1512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1567'/>
         </member-type>
         <member-function access='protected'>
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25166,7 +25166,7 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1514'>
+      <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1513'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-1017'/>
         <member-type access='private'>
           <typedef-decl name='__streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='67' column='1' id='type-id-1574'/>
@@ -25234,7 +25234,7 @@
           <typedef-decl name='__num_put_type' type-id='type-id-1235' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='71' column='1' id='type-id-1585'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-1514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1586'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1586'/>
         </member-type>
         <member-function access='protected'>
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25546,6 +25546,49 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='ctype_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='42' column='1' id='type-id-1370'>
+        <member-type access='public'>
+          <typedef-decl name='mask' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='49' column='1' id='type-id-1392'/>
+        </member-type>
+        <member-type access='public'>
+          <typedef-decl name='__to_type' type-id='type-id-1593' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='45' column='1' id='type-id-1372'/>
+        </member-type>
+        <data-member access='public' static='yes'>
+          <var-decl name='upper' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5upperE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='50' column='1' elf-symbol-id='_ZNSt10ctype_base5upperE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='lower' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5lowerE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='51' column='1' elf-symbol-id='_ZNSt10ctype_base5lowerE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='alpha' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5alphaE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='52' column='1' elf-symbol-id='_ZNSt10ctype_base5alphaE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='digit' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5digitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='53' column='1' elf-symbol-id='_ZNSt10ctype_base5digitE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='xdigit' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base6xdigitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='54' column='1' elf-symbol-id='_ZNSt10ctype_base6xdigitE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='space' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5spaceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='55' column='1' elf-symbol-id='_ZNSt10ctype_base5spaceE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='print' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5printE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='56' column='1' elf-symbol-id='_ZNSt10ctype_base5printE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='graph' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5graphE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='57' column='1' elf-symbol-id='_ZNSt10ctype_base5graphE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='cntrl' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5cntrlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='58' column='1' elf-symbol-id='_ZNSt10ctype_base5cntrlE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='punct' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5punctE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='59' column='1' elf-symbol-id='_ZNSt10ctype_base5punctE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='public' static='yes'>
+          <var-decl name='alnum' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5alnumE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='60' column='1' elf-symbol-id='_ZNSt10ctype_base5alnumE@@GLIBCXX_3.4'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='fpos&lt;__mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='114' column='1' id='type-id-1516'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -25556,13 +25599,13 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='fpos' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
+            <parameter type-id='type-id-1594' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='fpos' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
+            <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-1275'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -25570,226 +25613,226 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1447'>
+      <class-decl name='istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1446'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1318'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1594'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1595'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='int_type' type-id='type-id-1054' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1595'/>
+          <typedef-decl name='int_type' type-id='type-id-1054' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1596'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1596'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1597'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='istream_type' type-id='type-id-1099' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1597'/>
+          <typedef-decl name='istream_type' type-id='type-id-1099' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1598'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1598' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1599' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_c' type-id='type-id-1595' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
+          <var-decl name='_M_c' type-id='type-id-1596' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1600'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-1601'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1598'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-1599'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1468'>
+      <class-decl name='istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1467'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1321'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1601'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1602'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='int_type' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1602'/>
+          <typedef-decl name='int_type' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1603'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1603'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1604'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='istream_type' type-id='type-id-1106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1604'/>
+          <typedef-decl name='istream_type' type-id='type-id-1106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1605'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1605' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1606' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_c' type-id='type-id-1602' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
+          <var-decl name='_M_c' type-id='type-id-1603' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
+            <parameter type-id='type-id-1608'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
-            <parameter type-id='type-id-1605'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
+            <parameter type-id='type-id-1606'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1474'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1608'/>
+      <class-decl name='ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1473'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1609'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1609'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1610'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1610'/>
+          <typedef-decl name='ostream_type' type-id='type-id-1512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1611'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1611' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1612' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_failed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1612' is-artificial='yes'/>
-            <parameter type-id='type-id-1613'/>
+            <parameter type-id='type-id-1613' is-artificial='yes'/>
+            <parameter type-id='type-id-1614'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1612' is-artificial='yes'/>
-            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1613' is-artificial='yes'/>
+            <parameter type-id='type-id-1612'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1478'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1608'/>
+      <class-decl name='ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1477'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1609'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1614'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1615'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-1514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1615'/>
+          <typedef-decl name='ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1616'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1616' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1617' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_failed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-1618'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1619'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-1616'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1617'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1619' const='yes' id='type-id-1442'/>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='16' id='type-id-1398'>
-      <subrange length='2' type-id='type-id-106' id='type-id-1620'/>
+    <qualified-type-def type-id='type-id-1620' const='yes' id='type-id-1441'/>
+    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='16' id='type-id-1397'>
+      <subrange length='2' type-id='type-id-106' id='type-id-1621'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1412' size-in-bits='infinite' id='type-id-1405'>
+    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-1333'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1481'/>
+    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1483'/>
+    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1484'/>
+    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1486'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1487'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1488'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1489'/>
+    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-1623' size-in-bits='64' id='type-id-1491'/>
+    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-1492'/>
+    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1494'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1495'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1496'/>
+    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1342'/>
+    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
+    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1344'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-1358'/>
+    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1365'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-1360'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1360' size-in-bits='64' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1378'/>
+    <qualified-type-def type-id='type-id-1378' const='yes' id='type-id-1377'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1380'/>
+    <pointer-type-def type-id='type-id-1633' size-in-bits='64' id='type-id-1391'/>
+    <qualified-type-def type-id='type-id-1391' const='yes' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-1393'/>
+    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1390'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1497'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1499'/>
+    <qualified-type-def type-id='type-id-1635' const='yes' id='type-id-1443'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-1410'/>
+    <qualified-type-def type-id='type-id-1436' const='yes' id='type-id-1440'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1399'/>
+    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1408'/>
+    <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-1402'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1638' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1409'/>
+    <qualified-type-def type-id='type-id-1409' const='yes' id='type-id-1439'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1411'/>
+    <array-type-def dimensions='1' type-id='type-id-1411' size-in-bits='infinite' id='type-id-1404'>
       <subrange length='infinite' id='type-id-583'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1410' size-in-bits='infinite' id='type-id-1404'>
+    <array-type-def dimensions='1' type-id='type-id-1409' size-in-bits='infinite' id='type-id-1403'>
       <subrange length='infinite' id='type-id-583'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1621' const='yes' id='type-id-1334'/>
-    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1482'/>
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1483'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1484'/>
-    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1485'/>
-    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1486'/>
-    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1487'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1488'/>
-    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1489'/>
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1490'/>
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1491'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1492'/>
-    <pointer-type-def type-id='type-id-1623' size-in-bits='64' id='type-id-1493'/>
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1494'/>
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1495'/>
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1496'/>
-    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1497'/>
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-1343'/>
-    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1350'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1350' size-in-bits='64' id='type-id-1351'/>
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1359'/>
-    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-1366'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1366' size-in-bits='64' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-1379'/>
-    <qualified-type-def type-id='type-id-1379' const='yes' id='type-id-1378'/>
-    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1381'/>
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1392'/>
-    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-1633' size-in-bits='64' id='type-id-1394'/>
-    <qualified-type-def type-id='type-id-1393' const='yes' id='type-id-1391'/>
-    <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-1374'/>
-    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1498'/>
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1499'/>
-    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1500'/>
-    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1444'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1635' size-in-bits='64' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1411'/>
-    <qualified-type-def type-id='type-id-1437' const='yes' id='type-id-1441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1400'/>
-    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-1409'/>
-    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1403'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1439'/>
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1410'/>
-    <qualified-type-def type-id='type-id-1410' const='yes' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-1412'/>
-    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1449'/>
-    <qualified-type-def type-id='type-id-1449' const='yes' id='type-id-1451'/>
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1470'/>
-    <qualified-type-def type-id='type-id-1470' const='yes' id='type-id-1471'/>
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1476'/>
-    <qualified-type-def type-id='type-id-1476' const='yes' id='type-id-1475'/>
-    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1481'/>
-    <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1480'/>
-    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1376'/>
-    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-1464'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1448'/>
+    <qualified-type-def type-id='type-id-1448' const='yes' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1469'/>
+    <qualified-type-def type-id='type-id-1469' const='yes' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-1475' const='yes' id='type-id-1474'/>
+    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1480' const='yes' id='type-id-1479'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1375'/>
+    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-1463'/>
     <namespace-decl name='std'>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='47' column='1' id='type-id-1520'>
         <member-type access='private'>
-          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1349'>
+          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1348'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
@@ -25799,156 +25842,113 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1501'/>
-    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1465'/>
-    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-1457'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-1461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-1462'/>
-    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1502'/>
-    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1332'/>
-    <qualified-type-def type-id='type-id-1332' const='yes' id='type-id-1335'/>
-    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1331'/>
-    <qualified-type-def type-id='type-id-1643' id='type-id-1401'/>
-    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1333'/>
-    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-1421'/>
-    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1503'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1507'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1508'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1260' size-in-bits='64' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-1347'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1352'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1344'/>
-    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-1363'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1368'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1368' size-in-bits='64' id='type-id-1369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1416'/>
-    <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1428'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-1380'/>
-    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1389'/>
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-1395'/>
+    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1462'/>
+    <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1500'/>
+    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-1456'/>
+    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-1460'/>
+    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-1461'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1501'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1331'/>
+    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1334'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1330'/>
+    <qualified-type-def type-id='type-id-1644' id='type-id-1400'/>
+    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1332'/>
+    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1420'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1432'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1503'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1507'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1510'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1260' size-in-bits='64' id='type-id-1511'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1338' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1362'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1362' size-in-bits='64' id='type-id-1363'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1367'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1356' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1415'/>
+    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1376'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-1379'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1388'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1395'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1394'/>
+    <qualified-type-def type-id='type-id-1454' id='type-id-1451'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1454'/>
     <qualified-type-def type-id='type-id-1455' id='type-id-1452'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1455'/>
-    <qualified-type-def type-id='type-id-1456' id='type-id-1453'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1456'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1443'/>
-    <qualified-type-def type-id='type-id-1443' const='yes' id='type-id-1445'/>
-    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-1406'/>
-    <qualified-type-def type-id='type-id-1406' const='yes' id='type-id-1408'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-1399'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1438'/>
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1431'/>
-    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-1420'/>
-    <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1432'/>
-    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1417'/>
-    <pointer-type-def type-id='type-id-1655' size-in-bits='64' id='type-id-1418'/>
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1429'/>
-    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1430'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1414'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1426'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1415'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1658' size-in-bits='64' id='type-id-1413'/>
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1425'/>
-    <qualified-type-def type-id='type-id-1660' id='type-id-1454'/>
-    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1423'/>
-    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-1435'/>
-    <namespace-decl name='std'>
-      <class-decl name='ctype_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='42' column='1' id='type-id-1371'>
-        <member-type access='public'>
-          <typedef-decl name='mask' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='49' column='1' id='type-id-1393'/>
-        </member-type>
-        <member-type access='public'>
-          <typedef-decl name='__to_type' type-id='type-id-1665' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='45' column='1' id='type-id-1373'/>
-        </member-type>
-        <data-member access='public' static='yes'>
-          <var-decl name='upper' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5upperE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='50' column='1' elf-symbol-id='_ZNSt10ctype_base5upperE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='lower' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5lowerE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='51' column='1' elf-symbol-id='_ZNSt10ctype_base5lowerE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='alpha' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5alphaE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='52' column='1' elf-symbol-id='_ZNSt10ctype_base5alphaE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='digit' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5digitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='53' column='1' elf-symbol-id='_ZNSt10ctype_base5digitE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='xdigit' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base6xdigitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='54' column='1' elf-symbol-id='_ZNSt10ctype_base6xdigitE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='space' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5spaceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='55' column='1' elf-symbol-id='_ZNSt10ctype_base5spaceE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='print' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5printE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='56' column='1' elf-symbol-id='_ZNSt10ctype_base5printE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='graph' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5graphE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='57' column='1' elf-symbol-id='_ZNSt10ctype_base5graphE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='cntrl' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5cntrlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='58' column='1' elf-symbol-id='_ZNSt10ctype_base5cntrlE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='punct' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5punctE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='59' column='1' elf-symbol-id='_ZNSt10ctype_base5punctE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='public' static='yes'>
-          <var-decl name='alnum' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5alnumE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='60' column='1' elf-symbol-id='_ZNSt10ctype_base5alnumE@@GLIBCXX_3.4'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
+    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1442'/>
+    <qualified-type-def type-id='type-id-1442' const='yes' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-1405'/>
+    <qualified-type-def type-id='type-id-1405' const='yes' id='type-id-1407'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-1437'/>
+    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1423'/>
+    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1418'/>
+    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-1655' size-in-bits='64' id='type-id-1416'/>
+    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1417'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1658' size-in-bits='64' id='type-id-1429'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1412'/>
+    <pointer-type-def type-id='type-id-1660' size-in-bits='64' id='type-id-1424'/>
+    <qualified-type-def type-id='type-id-1661' id='type-id-1453'/>
+    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1421'/>
+    <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1433'/>
+    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1434'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__enable_if&lt;true, int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='47' column='1' id='type-id-1666'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-1450'/>
+          <typedef-decl name='__type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-1449'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_locale' type-id='type-id-1667' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='63' column='1' id='type-id-1340'/>
+      <typedef-decl name='__c_locale' type-id='type-id-1667' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='63' column='1' id='type-id-1339'/>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-12' size-in-bits='64' id='type-id-1459'/>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='8192' id='type-id-1386'>
+    <reference-type-def kind='lvalue' type-id='type-id-12' size-in-bits='64' id='type-id-1458'/>
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='8192' id='type-id-1385'>
       <subrange length='256' type-id='type-id-106' id='type-id-1519'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-53' size-in-bits='64' id='type-id-1460'/>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1024' id='type-id-1388'>
+    <reference-type-def kind='lvalue' type-id='type-id-53' size-in-bits='64' id='type-id-1459'/>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1024' id='type-id-1387'>
       <subrange length='16' type-id='type-id-106' id='type-id-1668'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-1458'/>
-    <array-type-def dimensions='1' type-id='type-id-209' size-in-bits='256' id='type-id-1387'>
+    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-1457'/>
+    <array-type-def dimensions='1' type-id='type-id-209' size-in-bits='256' id='type-id-1386'>
       <subrange length='16' type-id='type-id-106' id='type-id-1668'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-18' size-in-bits='64' id='type-id-1466'/>
+    <reference-type-def kind='lvalue' type-id='type-id-18' size-in-bits='64' id='type-id-1465'/>
     <namespace-decl name='std'>
-      <class-decl name='__timepunct&lt;char&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1644'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__timepunct&lt;char&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1645'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1670' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='183' column='1' id='type-id-1669'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt11__timepunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt11__timepunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1671' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
+          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='_M_name_timepunct' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='188' column='1'/>
@@ -25966,20 +25966,20 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_timepunct' mangled-name='_ZNSt11__timepunctIcE23_M_initialize_timepunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcE23_M_initialize_timepunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1673' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-1671'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -25987,8 +25987,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -25996,14 +25996,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-1671'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26011,8 +26011,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26083,21 +26083,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26105,19 +26105,19 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='__timepunct&lt;wchar_t&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1645'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__timepunct&lt;wchar_t&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1646'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1675' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='183' column='1' id='type-id-1674'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt11__timepunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt11__timepunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
+          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='_M_name_timepunct' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='188' column='1'/>
@@ -26135,20 +26135,20 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_timepunct' mangled-name='_ZNSt11__timepunctIwE23_M_initialize_timepunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwE23_M_initialize_timepunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1678' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-1676'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26156,8 +26156,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26165,14 +26165,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-1676'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26180,8 +26180,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26252,21 +26252,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26276,7 +26276,7 @@
     <namespace-decl name='std'>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='47' column='1' id='type-id-1520'>
         <member-type access='private'>
-          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1349'>
+          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1348'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
@@ -26287,28 +26287,28 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='collate&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1646'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='collate&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1647'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='593' column='1' id='type-id-1679'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7collateIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7collateIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_collate' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
+          <var-decl name='_M_c_locale_collate' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26332,15 +26332,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26373,21 +26373,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26421,28 +26421,28 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='collate&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1647'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='collate&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1648'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='593' column='1' id='type-id-1682'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7collateIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7collateIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_collate' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
+          <var-decl name='_M_c_locale_collate' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26466,15 +26466,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26507,21 +26507,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26555,32 +26555,35 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='messages&lt;char&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1648'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='iterator&lt;std::output_iterator_tag, void, void, void, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1609'/>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='messages&lt;char&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1649'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1702' column='1' id='type-id-1686'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8messagesIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8messagesIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_messages' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
+          <var-decl name='_M_c_locale_messages' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_name_messages' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1709' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26588,15 +26591,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26652,21 +26655,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26699,32 +26702,32 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='messages&lt;wchar_t&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1649'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='messages&lt;wchar_t&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1650'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1702' column='1' id='type-id-1691'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8messagesIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8messagesIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_messages' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
+          <var-decl name='_M_c_locale_messages' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_name_messages' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1709' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26732,15 +26735,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -26796,21 +26799,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26843,30 +26846,30 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='money_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1650'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1651'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1376' column='1' id='type-id-1695'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1696'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1696'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1378' column='1' id='type-id-1697'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26877,8 +26880,8 @@
             <parameter type-id='type-id-1696' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <parameter type-id='type-id-1209' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <return type-id='type-id-1696'/>
           </function-decl>
@@ -26889,8 +26892,8 @@
             <parameter type-id='type-id-1696' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <parameter type-id='type-id-1699' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <return type-id='type-id-1696'/>
           </function-decl>
@@ -26900,10 +26903,10 @@
             <parameter type-id='type-id-1698' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1696' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -26911,29 +26914,29 @@
             <parameter type-id='type-id-1698' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1696' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26944,10 +26947,10 @@
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -26956,39 +26959,39 @@
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-1701'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='money_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1651'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1652'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1376' column='1' id='type-id-1702'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1703'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1703'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1378' column='1' id='type-id-1704'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -26999,8 +27002,8 @@
             <parameter type-id='type-id-1703' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <parameter type-id='type-id-1209' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <return type-id='type-id-1703'/>
           </function-decl>
@@ -27011,8 +27014,8 @@
             <parameter type-id='type-id-1703' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <parameter type-id='type-id-1706' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <return type-id='type-id-1703'/>
           </function-decl>
@@ -27022,10 +27025,10 @@
             <parameter type-id='type-id-1705' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1703' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -27033,29 +27036,29 @@
             <parameter type-id='type-id-1705' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1703' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27066,10 +27069,10 @@
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -27078,39 +27081,39 @@
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-1708'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='money_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1652'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1653'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1526' column='1' id='type-id-1709'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1710'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1710'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1528' column='1' id='type-id-1711'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27120,7 +27123,7 @@
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <parameter type-id='type-id-412' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <return type-id='type-id-1710'/>
@@ -27131,7 +27134,7 @@
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <return type-id='type-id-1710'/>
@@ -27141,39 +27144,39 @@
           <function-decl name='_M_insert&lt;false&gt;' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES3_S3_RSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES3_S3_RSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert&lt;true&gt;' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES3_S3_RSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES3_S3_RSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27183,10 +27186,10 @@
             <parameter type-id='type-id-1714' is-artificial='yes'/>
             <parameter type-id='type-id-1710'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1709'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -27194,39 +27197,39 @@
             <parameter type-id='type-id-1714' is-artificial='yes'/>
             <parameter type-id='type-id-1710'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1709'/>
             <parameter type-id='type-id-1715'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='money_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1653'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1654'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1526' column='1' id='type-id-1716'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1717'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1717'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1528' column='1' id='type-id-1718'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27236,7 +27239,7 @@
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <parameter type-id='type-id-412' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <return type-id='type-id-1717'/>
@@ -27247,7 +27250,7 @@
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <return type-id='type-id-1717'/>
@@ -27257,39 +27260,39 @@
           <function-decl name='_M_insert&lt;false&gt;' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert&lt;true&gt;' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27299,10 +27302,10 @@
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <parameter type-id='type-id-1717'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1716'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -27310,17 +27313,17 @@
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <parameter type-id='type-id-1717'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1716'/>
             <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='moneypunct&lt;char, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1654'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;char, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1655'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1724'/>
@@ -27332,7 +27335,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1727' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1726'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIcLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb0EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIcLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb0EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -27342,7 +27345,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-1728'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27350,8 +27353,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27360,28 +27363,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1729' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-1728'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27389,8 +27392,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27452,21 +27455,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27528,8 +27531,8 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='moneypunct&lt;char, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;char, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1656'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1732'/>
@@ -27541,7 +27544,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1735' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1734'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIcLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb1EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIcLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb1EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1736' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -27551,7 +27554,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-1736'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27559,8 +27562,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27569,28 +27572,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1737' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-1736'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27598,8 +27601,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27661,21 +27664,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27737,8 +27740,8 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='moneypunct&lt;wchar_t, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;wchar_t, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1657'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1740' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1739'/>
@@ -27750,7 +27753,7 @@
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='941' column='1' id='type-id-1742'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIwLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb0EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIwLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb0EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1743' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -27760,7 +27763,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1743'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27768,8 +27771,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27778,28 +27781,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1744' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1743'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27807,8 +27810,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27870,21 +27873,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27946,8 +27949,8 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='moneypunct&lt;wchar_t, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;wchar_t, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1658'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1746'/>
@@ -27959,7 +27962,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1749' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1748'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIwLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb1EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIwLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb1EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1750' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -27969,7 +27972,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27977,8 +27980,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -27987,28 +27990,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1751' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28016,8 +28019,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28079,21 +28082,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28155,8 +28158,8 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='numpunct&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='numpunct&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1659'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1754' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1652' column='1' id='type-id-1753'/>
         </member-type>
@@ -28167,14 +28170,14 @@
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1649' column='1' id='type-id-1756'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8numpunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8numpunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1757' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1655' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-1757'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28182,8 +28185,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28191,27 +28194,27 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_numpunct' mangled-name='_ZNSt8numpunctIcE22_M_initialize_numpunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcE22_M_initialize_numpunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1758' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-1757'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28219,8 +28222,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28257,21 +28260,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28309,8 +28312,8 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='numpunct&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1659'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='numpunct&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1660'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1761' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1652' column='1' id='type-id-1760'/>
         </member-type>
@@ -28321,14 +28324,14 @@
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1649' column='1' id='type-id-1763'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8numpunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8numpunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1764' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1655' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-1764'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28336,8 +28339,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28345,27 +28348,27 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_numpunct' mangled-name='_ZNSt8numpunctIwE22_M_initialize_numpunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwE22_M_initialize_numpunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1765' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-1764'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -28373,8 +28376,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28411,21 +28414,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28463,28 +28466,28 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='time_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1661'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1662'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1767'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='374' column='1' id='type-id-1768'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1769'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1769'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28500,8 +28503,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -28511,8 +28514,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -28522,8 +28525,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -28533,8 +28536,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -28544,8 +28547,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -28559,9 +28562,9 @@
             <parameter type-id='type-id-6' name='__min' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-6' name='__max' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-96' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28572,9 +28575,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-980' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28585,9 +28588,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-980' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28595,30 +28598,30 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-4' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='630' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28634,10 +28637,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -28645,10 +28648,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -28656,10 +28659,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -28667,10 +28670,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -28678,37 +28681,37 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='time_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1662'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1663'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1767'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='374' column='1' id='type-id-1773'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1774'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1774'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28724,8 +28727,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -28735,8 +28738,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -28746,8 +28749,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -28757,8 +28760,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -28768,8 +28771,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -28783,9 +28786,9 @@
             <parameter type-id='type-id-6' name='__min' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-6' name='__max' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-96' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28796,9 +28799,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-1084' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28809,9 +28812,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-1084' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -28819,30 +28822,30 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-395' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='630' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28858,10 +28861,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -28869,10 +28872,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -28880,10 +28883,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -28891,10 +28894,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -28902,36 +28905,36 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='time_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1663'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1664'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='721' column='1' id='type-id-1777'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1778'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1778'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28940,7 +28943,7 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1779' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1778' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-1777' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
             <parameter type-id='type-id-16' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
@@ -28952,31 +28955,31 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmPKcSB_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmPKcSB_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1779' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1778' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-1777' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-4' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
             <parameter type-id='type-id-4' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -28985,38 +28988,38 @@
           <function-decl name='do_put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1780' is-artificial='yes'/>
             <parameter type-id='type-id-1778'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1777'/>
             <parameter type-id='type-id-282'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='time_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1664'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1665'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='721' column='1' id='type-id-1781'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1782'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1782'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29025,7 +29028,7 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1783' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1782' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-1781' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
             <parameter type-id='type-id-16' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
@@ -29037,31 +29040,31 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmPKwSB_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmPKwSB_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1783' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1782' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-1781' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-395' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
             <parameter type-id='type-id-395' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29070,19 +29073,19 @@
           <function-decl name='do_put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1784' is-artificial='yes'/>
             <parameter type-id='type-id-1782'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1781'/>
             <parameter type-id='type-id-282'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1619'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1665'/>
-    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1620'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-1622'/>
     <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-1526'/>
     <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-1532'/>
     <reference-type-def kind='lvalue' type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
@@ -29095,47 +29098,47 @@
     <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
     <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-1552'/>
     <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-1553'/>
-    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1622'/>
-    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1623'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1623'/>
+    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1624'/>
     <pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-1573'/>
     <qualified-type-def type-id='type-id-1795' const='yes' id='type-id-1559'/>
     <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-1592'/>
     <qualified-type-def type-id='type-id-1797' const='yes' id='type-id-1579'/>
-    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1624'/>
-    <qualified-type-def type-id='type-id-1338' const='yes' id='type-id-1625'/>
+    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1625'/>
     <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1626'/>
-    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1627'/>
-    <qualified-type-def type-id='type-id-1356' const='yes' id='type-id-1628'/>
+    <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1627'/>
+    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1628'/>
     <qualified-type-def type-id='type-id-1355' const='yes' id='type-id-1629'/>
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1630'/>
-    <qualified-type-def type-id='type-id-1372' const='yes' id='type-id-1631'/>
-    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1632'/>
-    <qualified-type-def type-id='type-id-1383' const='yes' id='type-id-1633'/>
-    <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-1634'/>
-    <qualified-type-def type-id='type-id-1402' const='yes' id='type-id-1635'/>
-    <qualified-type-def type-id='type-id-1370' const='yes' id='type-id-1636'/>
-    <qualified-type-def type-id='type-id-1341' const='yes' id='type-id-1637'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1638'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1639'/>
-    <qualified-type-def type-id='type-id-1224' const='yes' id='type-id-1640'/>
-    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1641'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1340' size-in-bits='64' id='type-id-1643'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1525'/>
+    <qualified-type-def type-id='type-id-1354' const='yes' id='type-id-1630'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1631'/>
+    <qualified-type-def type-id='type-id-1371' const='yes' id='type-id-1632'/>
+    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1633'/>
+    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1634'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1635'/>
+    <qualified-type-def type-id='type-id-1401' const='yes' id='type-id-1636'/>
+    <qualified-type-def type-id='type-id-1369' const='yes' id='type-id-1637'/>
+    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-1638'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1639'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1640'/>
+    <qualified-type-def type-id='type-id-1224' const='yes' id='type-id-1641'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1642'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1525'/>
     <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1530'/>
     <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
     <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1534'/>
     <reference-type-def kind='lvalue' type-id='type-id-1534' size-in-bits='64' id='type-id-1535'/>
     <reference-type-def kind='lvalue' type-id='type-id-1524' size-in-bits='64' id='type-id-1527'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1539'/>
+    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-1539'/>
     <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-1544'/>
     <reference-type-def kind='lvalue' type-id='type-id-1544' size-in-bits='64' id='type-id-1545'/>
     <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1548'/>
     <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <reference-type-def kind='lvalue' type-id='type-id-1538' size-in-bits='64' id='type-id-1541'/>
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1551'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-1551'/>
     <pointer-type-def type-id='type-id-1550' size-in-bits='64' id='type-id-1554'/>
     <qualified-type-def type-id='type-id-1558' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1558'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1558'/>
     <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1569'/>
     <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-1572'/>
     <reference-type-def kind='lvalue' type-id='type-id-1567' size-in-bits='64' id='type-id-1571'/>
@@ -29143,166 +29146,35 @@
     <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-1568'/>
     <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-1557'/>
     <qualified-type-def type-id='type-id-1578' id='type-id-1576'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1514' size-in-bits='64' id='type-id-1578'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1578'/>
     <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1588'/>
     <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-1591'/>
     <reference-type-def kind='lvalue' type-id='type-id-1586' size-in-bits='64' id='type-id-1590'/>
     <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1589'/>
     <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-1587'/>
     <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-1577'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1593'/>
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1599'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1597' size-in-bits='64' id='type-id-1600'/>
-    <pointer-type-def type-id='type-id-1594' size-in-bits='64' id='type-id-1598'/>
-    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-1606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-1605'/>
-    <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-1612'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1613'/>
-    <pointer-type-def type-id='type-id-1609' size-in-bits='64' id='type-id-1611'/>
-    <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-1617'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1615' size-in-bits='64' id='type-id-1618'/>
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1616'/>
-    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-1660'/>
-    <namespace-decl name='std'>
-      <class-decl name='iterator&lt;std::output_iterator_tag, void, void, void, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1608'/>
-    </namespace-decl>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1594'/>
+    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1600'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1601'/>
+    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-1599'/>
+    <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-1607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1605' size-in-bits='64' id='type-id-1608'/>
+    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-1606'/>
+    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-1613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1611' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1612'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1618'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1619'/>
+    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-1617'/>
+    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-1661'/>
     <typedef-decl name='__locale_t' type-id='type-id-1802' filepath='/usr/include/xlocale.h' line='40' column='1' id='type-id-1667'/>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_file' type-id='type-id-204' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-1642'/>
+      <typedef-decl name='__c_file' type-id='type-id-204' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-1643'/>
     </namespace-decl>
     <pointer-type-def type-id='type-id-1803' size-in-bits='64' id='type-id-1802'/>
-    <namespace-decl name='std'>
-      <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-1723'>
-        <member-type access='private'>
-          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-1804'>
-            <underlying-type type-id='type-id-21'/>
-            <enumerator name='none' value='0'/>
-            <enumerator name='space' value='1'/>
-            <enumerator name='symbol' value='2'/>
-            <enumerator name='sign' value='3'/>
-            <enumerator name='value' value='4'/>
-          </enum-decl>
-        </member-type>
-        <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-1805'>
-            <underlying-type type-id='type-id-21'/>
-            <enumerator name='_S_minus' value='0'/>
-            <enumerator name='_S_zero' value='1'/>
-            <enumerator name='_S_end' value='11'/>
-          </enum-decl>
-        </member-type>
-        <member-type access='private'>
-          <class-decl name='pattern' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='844' column='1' id='type-id-1731'>
-            <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='field' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='844' column='1'/>
-            </data-member>
-          </class-decl>
-        </member-type>
-        <data-member access='private' static='yes'>
-          <var-decl name='_S_default_pattern' type-id='type-id-1806' mangled-name='_ZNSt10money_base18_S_default_patternE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='846' column='1' elf-symbol-id='_ZNSt10money_base18_S_default_patternE@@GLIBCXX_3.4'/>
-        </data-member>
-        <data-member access='private' static='yes'>
-          <var-decl name='_S_atoms' type-id='type-id-4' mangled-name='_ZNSt10money_base8_S_atomsE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='857' column='1' elf-symbol-id='_ZNSt10money_base8_S_atomsE@@GLIBCXX_3.4'/>
-        </data-member>
-        <member-function access='private' static='yes'>
-          <function-decl name='_S_construct_pattern' mangled-name='_ZNSt10money_base20_S_construct_patternEccc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10money_base20_S_construct_patternEccc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-16'/>
-            <parameter type-id='type-id-16'/>
-            <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1731'/>
-          </function-decl>
-        </member-function>
-      </class-decl>
-    </namespace-decl>
-    <namespace-decl name='std'>
-      <class-decl name='time_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='52' column='1' id='type-id-1767'>
-        <member-type access='private'>
-          <enum-decl name='dateorder' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='55' column='1' id='type-id-1771'>
-            <underlying-type type-id='type-id-21'/>
-            <enumerator name='no_order' value='0'/>
-            <enumerator name='dmy' value='1'/>
-            <enumerator name='mdy' value='2'/>
-            <enumerator name='ymd' value='3'/>
-            <enumerator name='ydm' value='4'/>
-          </enum-decl>
-        </member-type>
-      </class-decl>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1785'/>
-    <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1786'/>
-    <qualified-type-def type-id='type-id-1523' const='yes' id='type-id-1787'/>
-    <qualified-type-def type-id='type-id-1522' const='yes' id='type-id-1788'/>
-    <qualified-type-def type-id='type-id-1354' const='yes' id='type-id-1789'/>
-    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1790'/>
-    <qualified-type-def type-id='type-id-1536' const='yes' id='type-id-1791'/>
-    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1792'/>
-    <qualified-type-def type-id='type-id-1550' const='yes' id='type-id-1793'/>
-    <qualified-type-def type-id='type-id-1807' const='yes' id='type-id-1672'/>
-    <qualified-type-def type-id='type-id-1808' const='yes' id='type-id-1677'/>
-    <qualified-type-def type-id='type-id-1560' const='yes' id='type-id-1794'/>
-    <pointer-type-def type-id='type-id-1809' size-in-bits='64' id='type-id-1795'/>
-    <qualified-type-def type-id='type-id-1580' const='yes' id='type-id-1796'/>
-    <pointer-type-def type-id='type-id-1810' size-in-bits='64' id='type-id-1797'/>
-    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-1681'/>
-    <qualified-type-def type-id='type-id-1681' const='yes' id='type-id-1680'/>
-    <pointer-type-def type-id='type-id-1812' size-in-bits='64' id='type-id-1684'/>
-    <qualified-type-def type-id='type-id-1684' const='yes' id='type-id-1683'/>
-    <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1687'/>
-    <qualified-type-def type-id='type-id-1687' const='yes' id='type-id-1689'/>
-    <qualified-type-def type-id='type-id-1814' id='type-id-1690'/>
-    <pointer-type-def type-id='type-id-1815' size-in-bits='64' id='type-id-1692'/>
-    <qualified-type-def type-id='type-id-1692' const='yes' id='type-id-1693'/>
-    <qualified-type-def type-id='type-id-1816' id='type-id-1694'/>
-    <pointer-type-def type-id='type-id-1817' size-in-bits='64' id='type-id-1700'/>
-    <qualified-type-def type-id='type-id-1700' const='yes' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-1818' size-in-bits='64' id='type-id-1707'/>
-    <qualified-type-def type-id='type-id-1707' const='yes' id='type-id-1705'/>
-    <pointer-type-def type-id='type-id-1819' size-in-bits='64' id='type-id-1714'/>
-    <qualified-type-def type-id='type-id-1714' const='yes' id='type-id-1712'/>
-    <qualified-type-def type-id='type-id-1715' id='type-id-1713'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1820' size-in-bits='64' id='type-id-1715'/>
-    <pointer-type-def type-id='type-id-1821' size-in-bits='64' id='type-id-1721'/>
-    <qualified-type-def type-id='type-id-1721' const='yes' id='type-id-1719'/>
-    <qualified-type-def type-id='type-id-1722' id='type-id-1720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1822' size-in-bits='64' id='type-id-1722'/>
-    <pointer-type-def type-id='type-id-1823' size-in-bits='64' id='type-id-1730'/>
-    <pointer-type-def type-id='type-id-1824' size-in-bits='64' id='type-id-1738'/>
-    <pointer-type-def type-id='type-id-1825' size-in-bits='64' id='type-id-1745'/>
-    <pointer-type-def type-id='type-id-1826' size-in-bits='64' id='type-id-1752'/>
-    <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1759'/>
-    <pointer-type-def type-id='type-id-1828' size-in-bits='64' id='type-id-1766'/>
-    <pointer-type-def type-id='type-id-1829' size-in-bits='64' id='type-id-1770'/>
-    <qualified-type-def type-id='type-id-1770' const='yes' id='type-id-1772'/>
-    <pointer-type-def type-id='type-id-1830' size-in-bits='64' id='type-id-1775'/>
-    <qualified-type-def type-id='type-id-1775' const='yes' id='type-id-1776'/>
-    <pointer-type-def type-id='type-id-1831' size-in-bits='64' id='type-id-1780'/>
-    <qualified-type-def type-id='type-id-1780' const='yes' id='type-id-1779'/>
-    <pointer-type-def type-id='type-id-1832' size-in-bits='64' id='type-id-1784'/>
-    <qualified-type-def type-id='type-id-1784' const='yes' id='type-id-1783'/>
-    <qualified-type-def type-id='type-id-1421' const='yes' id='type-id-1673'/>
-    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1671'/>
-    <qualified-type-def type-id='type-id-1433' const='yes' id='type-id-1678'/>
-    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1676'/>
-    <qualified-type-def type-id='type-id-1701' id='type-id-1699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1697' size-in-bits='64' id='type-id-1701'/>
-    <qualified-type-def type-id='type-id-1708' id='type-id-1706'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1704' size-in-bits='64' id='type-id-1708'/>
-    <qualified-type-def type-id='type-id-1417' const='yes' id='type-id-1729'/>
-    <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-1728'/>
-    <qualified-type-def type-id='type-id-1418' const='yes' id='type-id-1737'/>
-    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1736'/>
-    <qualified-type-def type-id='type-id-1429' const='yes' id='type-id-1744'/>
-    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1743'/>
-    <qualified-type-def type-id='type-id-1430' const='yes' id='type-id-1751'/>
-    <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1750'/>
-    <qualified-type-def type-id='type-id-1413' const='yes' id='type-id-1758'/>
-    <pointer-type-def type-id='type-id-1753' size-in-bits='64' id='type-id-1757'/>
-    <qualified-type-def type-id='type-id-1425' const='yes' id='type-id-1765'/>
-    <pointer-type-def type-id='type-id-1760' size-in-bits='64' id='type-id-1764'/>
     <namespace-decl name='std'>
       <class-decl name='__moneypunct_cache&lt;char, false&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1727'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -29346,56 +29218,56 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='800'>
-          <var-decl name='_M_atoms' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-1835'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
+            <parameter type-id='type-id-1806'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1836' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1807' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29404,7 +29276,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__moneypunct_cache&lt;char, true&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1735'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -29448,56 +29320,56 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='800'>
-          <var-decl name='_M_atoms' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <parameter type-id='type-id-1838'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
+            <parameter type-id='type-id-1809'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1839' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1810' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29506,7 +29378,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__moneypunct_cache&lt;wchar_t, false&gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1740'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -29550,56 +29422,56 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
-          <var-decl name='_M_atoms' type-id='type-id-1840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
+            <parameter type-id='type-id-1813'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1843' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1814' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29608,7 +29480,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__moneypunct_cache&lt;wchar_t, true&gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1749'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -29652,56 +29524,56 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
-          <var-decl name='_M_atoms' type-id='type-id-1840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
-            <parameter type-id='type-id-1845'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
+            <parameter type-id='type-id-1816'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1846' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1817' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29710,7 +29582,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__numpunct_cache&lt;char&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1570' column='1' id='type-id-1754'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
@@ -29739,59 +29611,59 @@
           <var-decl name='_M_thousands_sep' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1580' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='592'>
-          <var-decl name='_M_atoms_out' type-id='type-id-1847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
+          <var-decl name='_M_atoms_out' type-id='type-id-1818' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='880'>
-          <var-decl name='_M_atoms_in' type-id='type-id-1848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
+          <var-decl name='_M_atoms_in' type-id='type-id-1819' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
-            <parameter type-id='type-id-1850'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
+            <parameter type-id='type-id-1821'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt16__numpunct_cacheIcE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1851' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1822' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29800,7 +29672,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__numpunct_cache&lt;wchar_t&gt;' size-in-bits='2688' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1570' column='1' id='type-id-1761'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
@@ -29829,59 +29701,59 @@
           <var-decl name='_M_thousands_sep' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1580' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='_M_atoms_out' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
+          <var-decl name='_M_atoms_out' type-id='type-id-1823' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1792'>
-          <var-decl name='_M_atoms_in' type-id='type-id-1853' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
+          <var-decl name='_M_atoms_in' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2624'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
-            <parameter type-id='type-id-1855'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <parameter type-id='type-id-1826'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt16__numpunct_cacheIwE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1856' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1827' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -29890,9 +29762,9 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__timepunct_cache&lt;char&gt;' size-in-bits='3200' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='59' column='1' id='type-id-1670'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' static='yes'>
-          <var-decl name='_S_timezones' type-id='type-id-1857' mangled-name='_ZNSt17__timepunct_cacheIcE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='34' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIcE12_S_timezonesE@@GLIBCXX_3.4'/>
+          <var-decl name='_S_timezones' type-id='type-id-1828' mangled-name='_ZNSt17__timepunct_cacheIcE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='34' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIcE12_S_timezonesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_date_format' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='64' column='1'/>
@@ -30040,42 +29912,42 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
-            <parameter type-id='type-id-1859'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
+            <parameter type-id='type-id-1830'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30084,9 +29956,9 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='__timepunct_cache&lt;wchar_t&gt;' size-in-bits='3200' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='59' column='1' id='type-id-1675'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' static='yes'>
-          <var-decl name='_S_timezones' type-id='type-id-1860' mangled-name='_ZNSt17__timepunct_cacheIwE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='43' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIwE12_S_timezonesE@@GLIBCXX_3.4'/>
+          <var-decl name='_S_timezones' type-id='type-id-1831' mangled-name='_ZNSt17__timepunct_cacheIwE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='43' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIwE12_S_timezonesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_date_format' type-id='type-id-395' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='64' column='1'/>
@@ -30234,42 +30106,42 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-1862'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
+            <parameter type-id='type-id-1833'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30283,115 +30155,243 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='88' id='type-id-1833'>
+    <namespace-decl name='std'>
+      <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-1723'>
+        <member-type access='private'>
+          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-1834'>
+            <underlying-type type-id='type-id-21'/>
+            <enumerator name='none' value='0'/>
+            <enumerator name='space' value='1'/>
+            <enumerator name='symbol' value='2'/>
+            <enumerator name='sign' value='3'/>
+            <enumerator name='value' value='4'/>
+          </enum-decl>
+        </member-type>
+        <member-type access='private'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-1835'>
+            <underlying-type type-id='type-id-21'/>
+            <enumerator name='_S_minus' value='0'/>
+            <enumerator name='_S_zero' value='1'/>
+            <enumerator name='_S_end' value='11'/>
+          </enum-decl>
+        </member-type>
+        <member-type access='private'>
+          <class-decl name='pattern' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='844' column='1' id='type-id-1731'>
+            <data-member access='public' layout-offset-in-bits='0'>
+              <var-decl name='field' type-id='type-id-952' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='844' column='1'/>
+            </data-member>
+          </class-decl>
+        </member-type>
+        <data-member access='private' static='yes'>
+          <var-decl name='_S_default_pattern' type-id='type-id-1836' mangled-name='_ZNSt10money_base18_S_default_patternE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='846' column='1' elf-symbol-id='_ZNSt10money_base18_S_default_patternE@@GLIBCXX_3.4'/>
+        </data-member>
+        <data-member access='private' static='yes'>
+          <var-decl name='_S_atoms' type-id='type-id-4' mangled-name='_ZNSt10money_base8_S_atomsE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='857' column='1' elf-symbol-id='_ZNSt10money_base8_S_atomsE@@GLIBCXX_3.4'/>
+        </data-member>
+        <member-function access='private' static='yes'>
+          <function-decl name='_S_construct_pattern' mangled-name='_ZNSt10money_base20_S_construct_patternEccc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10money_base20_S_construct_patternEccc@@GLIBCXX_3.4'>
+            <parameter type-id='type-id-16'/>
+            <parameter type-id='type-id-16'/>
+            <parameter type-id='type-id-16'/>
+            <return type-id='type-id-1731'/>
+          </function-decl>
+        </member-function>
+      </class-decl>
+    </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='time_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='52' column='1' id='type-id-1767'>
+        <member-type access='private'>
+          <enum-decl name='dateorder' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='55' column='1' id='type-id-1771'>
+            <underlying-type type-id='type-id-21'/>
+            <enumerator name='no_order' value='0'/>
+            <enumerator name='dmy' value='1'/>
+            <enumerator name='mdy' value='2'/>
+            <enumerator name='ymd' value='3'/>
+            <enumerator name='ydm' value='4'/>
+          </enum-decl>
+        </member-type>
+      </class-decl>
+    </namespace-decl>
+    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1785'/>
+    <qualified-type-def type-id='type-id-1335' const='yes' id='type-id-1786'/>
+    <qualified-type-def type-id='type-id-1523' const='yes' id='type-id-1787'/>
+    <qualified-type-def type-id='type-id-1522' const='yes' id='type-id-1788'/>
+    <qualified-type-def type-id='type-id-1353' const='yes' id='type-id-1789'/>
+    <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1790'/>
+    <qualified-type-def type-id='type-id-1536' const='yes' id='type-id-1791'/>
+    <qualified-type-def type-id='type-id-1381' const='yes' id='type-id-1792'/>
+    <qualified-type-def type-id='type-id-1550' const='yes' id='type-id-1793'/>
+    <qualified-type-def type-id='type-id-1837' const='yes' id='type-id-1672'/>
+    <qualified-type-def type-id='type-id-1838' const='yes' id='type-id-1677'/>
+    <qualified-type-def type-id='type-id-1560' const='yes' id='type-id-1794'/>
+    <pointer-type-def type-id='type-id-1839' size-in-bits='64' id='type-id-1795'/>
+    <qualified-type-def type-id='type-id-1580' const='yes' id='type-id-1796'/>
+    <pointer-type-def type-id='type-id-1840' size-in-bits='64' id='type-id-1797'/>
+    <pointer-type-def type-id='type-id-1841' size-in-bits='64' id='type-id-1681'/>
+    <qualified-type-def type-id='type-id-1681' const='yes' id='type-id-1680'/>
+    <pointer-type-def type-id='type-id-1842' size-in-bits='64' id='type-id-1684'/>
+    <qualified-type-def type-id='type-id-1684' const='yes' id='type-id-1683'/>
+    <pointer-type-def type-id='type-id-1843' size-in-bits='64' id='type-id-1687'/>
+    <qualified-type-def type-id='type-id-1687' const='yes' id='type-id-1689'/>
+    <qualified-type-def type-id='type-id-1844' id='type-id-1690'/>
+    <pointer-type-def type-id='type-id-1845' size-in-bits='64' id='type-id-1692'/>
+    <qualified-type-def type-id='type-id-1692' const='yes' id='type-id-1693'/>
+    <qualified-type-def type-id='type-id-1846' id='type-id-1694'/>
+    <pointer-type-def type-id='type-id-1847' size-in-bits='64' id='type-id-1700'/>
+    <qualified-type-def type-id='type-id-1700' const='yes' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-1848' size-in-bits='64' id='type-id-1707'/>
+    <qualified-type-def type-id='type-id-1707' const='yes' id='type-id-1705'/>
+    <pointer-type-def type-id='type-id-1849' size-in-bits='64' id='type-id-1714'/>
+    <qualified-type-def type-id='type-id-1714' const='yes' id='type-id-1712'/>
+    <qualified-type-def type-id='type-id-1715' id='type-id-1713'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1850' size-in-bits='64' id='type-id-1715'/>
+    <pointer-type-def type-id='type-id-1851' size-in-bits='64' id='type-id-1721'/>
+    <qualified-type-def type-id='type-id-1721' const='yes' id='type-id-1719'/>
+    <qualified-type-def type-id='type-id-1722' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1852' size-in-bits='64' id='type-id-1722'/>
+    <pointer-type-def type-id='type-id-1853' size-in-bits='64' id='type-id-1730'/>
+    <pointer-type-def type-id='type-id-1854' size-in-bits='64' id='type-id-1738'/>
+    <pointer-type-def type-id='type-id-1855' size-in-bits='64' id='type-id-1745'/>
+    <pointer-type-def type-id='type-id-1856' size-in-bits='64' id='type-id-1752'/>
+    <pointer-type-def type-id='type-id-1857' size-in-bits='64' id='type-id-1759'/>
+    <pointer-type-def type-id='type-id-1858' size-in-bits='64' id='type-id-1766'/>
+    <pointer-type-def type-id='type-id-1859' size-in-bits='64' id='type-id-1770'/>
+    <qualified-type-def type-id='type-id-1770' const='yes' id='type-id-1772'/>
+    <pointer-type-def type-id='type-id-1860' size-in-bits='64' id='type-id-1775'/>
+    <qualified-type-def type-id='type-id-1775' const='yes' id='type-id-1776'/>
+    <pointer-type-def type-id='type-id-1861' size-in-bits='64' id='type-id-1780'/>
+    <qualified-type-def type-id='type-id-1780' const='yes' id='type-id-1779'/>
+    <pointer-type-def type-id='type-id-1862' size-in-bits='64' id='type-id-1784'/>
+    <qualified-type-def type-id='type-id-1784' const='yes' id='type-id-1783'/>
+    <qualified-type-def type-id='type-id-1420' const='yes' id='type-id-1673'/>
+    <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1671'/>
+    <qualified-type-def type-id='type-id-1432' const='yes' id='type-id-1678'/>
+    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1676'/>
+    <qualified-type-def type-id='type-id-1701' id='type-id-1699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1697' size-in-bits='64' id='type-id-1701'/>
+    <qualified-type-def type-id='type-id-1708' id='type-id-1706'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1704' size-in-bits='64' id='type-id-1708'/>
+    <qualified-type-def type-id='type-id-1416' const='yes' id='type-id-1729'/>
+    <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-1728'/>
+    <qualified-type-def type-id='type-id-1417' const='yes' id='type-id-1737'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1736'/>
+    <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1744'/>
+    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1743'/>
+    <qualified-type-def type-id='type-id-1429' const='yes' id='type-id-1751'/>
+    <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1750'/>
+    <qualified-type-def type-id='type-id-1412' const='yes' id='type-id-1758'/>
+    <pointer-type-def type-id='type-id-1753' size-in-bits='64' id='type-id-1757'/>
+    <qualified-type-def type-id='type-id-1424' const='yes' id='type-id-1765'/>
+    <pointer-type-def type-id='type-id-1760' size-in-bits='64' id='type-id-1764'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='88' id='type-id-1804'>
       <subrange length='11' type-id='type-id-106' id='type-id-1863'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='208' id='type-id-1848'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='208' id='type-id-1819'>
       <subrange length='26' type-id='type-id-106' id='type-id-1864'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='288' id='type-id-1847'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='288' id='type-id-1818'>
       <subrange length='36' type-id='type-id-106' id='type-id-1865'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-1857'>
-      <subrange length='14' type-id='type-id-106' id='type-id-1866'/>
-    </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-1867' size-in-bits='64' id='type-id-1835'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1868' size-in-bits='64' id='type-id-1838'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1869' size-in-bits='64' id='type-id-1842'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1870' size-in-bits='64' id='type-id-1845'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1871' size-in-bits='64' id='type-id-1850'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1872' size-in-bits='64' id='type-id-1855'/>
-    <pointer-type-def type-id='type-id-1873' size-in-bits='64' id='type-id-1807'/>
-    <pointer-type-def type-id='type-id-1874' size-in-bits='64' id='type-id-1808'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1875' size-in-bits='64' id='type-id-1859'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1876' size-in-bits='64' id='type-id-1862'/>
-    <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1809'/>
-    <qualified-type-def type-id='type-id-1575' const='yes' id='type-id-1810'/>
-    <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1811'/>
-    <qualified-type-def type-id='type-id-1647' const='yes' id='type-id-1812'/>
-    <qualified-type-def type-id='type-id-1648' const='yes' id='type-id-1813'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1877' size-in-bits='64' id='type-id-1814'/>
-    <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1815'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1878' size-in-bits='64' id='type-id-1816'/>
-    <qualified-type-def type-id='type-id-1731' const='yes' id='type-id-1806'/>
-    <qualified-type-def type-id='type-id-1650' const='yes' id='type-id-1817'/>
-    <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1818'/>
-    <qualified-type-def type-id='type-id-1652' const='yes' id='type-id-1819'/>
-    <qualified-type-def type-id='type-id-1711' const='yes' id='type-id-1820'/>
-    <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-1821'/>
-    <qualified-type-def type-id='type-id-1718' const='yes' id='type-id-1822'/>
-    <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1823'/>
-    <qualified-type-def type-id='type-id-1655' const='yes' id='type-id-1824'/>
-    <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1825'/>
-    <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1826'/>
-    <qualified-type-def type-id='type-id-1658' const='yes' id='type-id-1827'/>
-    <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1828'/>
-    <qualified-type-def type-id='type-id-1661' const='yes' id='type-id-1829'/>
-    <qualified-type-def type-id='type-id-1662' const='yes' id='type-id-1830'/>
-    <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1831'/>
-    <qualified-type-def type-id='type-id-1664' const='yes' id='type-id-1832'/>
-    <array-type-def dimensions='1' type-id='type-id-395' size-in-bits='896' id='type-id-1860'>
-      <subrange length='14' type-id='type-id-106' id='type-id-1866'/>
-    </array-type-def>
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1834'/>
-    <qualified-type-def type-id='type-id-1834' const='yes' id='type-id-1836'/>
-    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1837'/>
-    <qualified-type-def type-id='type-id-1837' const='yes' id='type-id-1839'/>
-    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1841'/>
-    <qualified-type-def type-id='type-id-1841' const='yes' id='type-id-1843'/>
-    <pointer-type-def type-id='type-id-1749' size-in-bits='64' id='type-id-1844'/>
-    <qualified-type-def type-id='type-id-1844' const='yes' id='type-id-1846'/>
-    <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1849'/>
-    <qualified-type-def type-id='type-id-1849' const='yes' id='type-id-1851'/>
-    <pointer-type-def type-id='type-id-1761' size-in-bits='64' id='type-id-1854'/>
-    <qualified-type-def type-id='type-id-1854' const='yes' id='type-id-1856'/>
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1858'/>
-    <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1861'/>
     <class-decl name='__locale_struct' size-in-bits='1856' is-struct='yes' visibility='default' filepath='/usr/include/xlocale.h' line='28' column='1' id='type-id-1803'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__locales' type-id='type-id-1879' visibility='default' filepath='/usr/include/xlocale.h' line='31' column='1'/>
+        <var-decl name='__locales' type-id='type-id-1866' visibility='default' filepath='/usr/include/xlocale.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='__ctype_b' type-id='type-id-1880' visibility='default' filepath='/usr/include/xlocale.h' line='34' column='1'/>
+        <var-decl name='__ctype_b' type-id='type-id-1867' visibility='default' filepath='/usr/include/xlocale.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='__ctype_tolower' type-id='type-id-1665' visibility='default' filepath='/usr/include/xlocale.h' line='35' column='1'/>
+        <var-decl name='__ctype_tolower' type-id='type-id-1593' visibility='default' filepath='/usr/include/xlocale.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__ctype_toupper' type-id='type-id-1665' visibility='default' filepath='/usr/include/xlocale.h' line='36' column='1'/>
+        <var-decl name='__ctype_toupper' type-id='type-id-1593' visibility='default' filepath='/usr/include/xlocale.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='__names' type-id='type-id-1881' visibility='default' filepath='/usr/include/xlocale.h' line='39' column='1'/>
+        <var-decl name='__names' type-id='type-id-1868' visibility='default' filepath='/usr/include/xlocale.h' line='39' column='1'/>
       </data-member>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='352' id='type-id-1840'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-1828'>
+      <subrange length='14' type-id='type-id-106' id='type-id-1869'/>
+    </array-type-def>
+    <reference-type-def kind='lvalue' type-id='type-id-1870' size-in-bits='64' id='type-id-1806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1871' size-in-bits='64' id='type-id-1809'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1872' size-in-bits='64' id='type-id-1813'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1873' size-in-bits='64' id='type-id-1816'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1874' size-in-bits='64' id='type-id-1821'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1875' size-in-bits='64' id='type-id-1826'/>
+    <pointer-type-def type-id='type-id-1876' size-in-bits='64' id='type-id-1837'/>
+    <pointer-type-def type-id='type-id-1877' size-in-bits='64' id='type-id-1838'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1878' size-in-bits='64' id='type-id-1830'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1879' size-in-bits='64' id='type-id-1833'/>
+    <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1839'/>
+    <qualified-type-def type-id='type-id-1575' const='yes' id='type-id-1840'/>
+    <qualified-type-def type-id='type-id-1647' const='yes' id='type-id-1841'/>
+    <qualified-type-def type-id='type-id-1648' const='yes' id='type-id-1842'/>
+    <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1843'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1880' size-in-bits='64' id='type-id-1844'/>
+    <qualified-type-def type-id='type-id-1650' const='yes' id='type-id-1845'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1881' size-in-bits='64' id='type-id-1846'/>
+    <qualified-type-def type-id='type-id-1731' const='yes' id='type-id-1836'/>
+    <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1847'/>
+    <qualified-type-def type-id='type-id-1652' const='yes' id='type-id-1848'/>
+    <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-1849'/>
+    <qualified-type-def type-id='type-id-1711' const='yes' id='type-id-1850'/>
+    <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1851'/>
+    <qualified-type-def type-id='type-id-1718' const='yes' id='type-id-1852'/>
+    <qualified-type-def type-id='type-id-1655' const='yes' id='type-id-1853'/>
+    <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1854'/>
+    <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1855'/>
+    <qualified-type-def type-id='type-id-1658' const='yes' id='type-id-1856'/>
+    <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1857'/>
+    <qualified-type-def type-id='type-id-1660' const='yes' id='type-id-1858'/>
+    <qualified-type-def type-id='type-id-1662' const='yes' id='type-id-1859'/>
+    <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1860'/>
+    <qualified-type-def type-id='type-id-1664' const='yes' id='type-id-1861'/>
+    <qualified-type-def type-id='type-id-1665' const='yes' id='type-id-1862'/>
+    <array-type-def dimensions='1' type-id='type-id-395' size-in-bits='896' id='type-id-1831'>
+      <subrange length='14' type-id='type-id-106' id='type-id-1869'/>
+    </array-type-def>
+    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1805'/>
+    <qualified-type-def type-id='type-id-1805' const='yes' id='type-id-1807'/>
+    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1808'/>
+    <qualified-type-def type-id='type-id-1808' const='yes' id='type-id-1810'/>
+    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1812'/>
+    <qualified-type-def type-id='type-id-1812' const='yes' id='type-id-1814'/>
+    <pointer-type-def type-id='type-id-1749' size-in-bits='64' id='type-id-1815'/>
+    <qualified-type-def type-id='type-id-1815' const='yes' id='type-id-1817'/>
+    <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1820'/>
+    <qualified-type-def type-id='type-id-1820' const='yes' id='type-id-1822'/>
+    <pointer-type-def type-id='type-id-1761' size-in-bits='64' id='type-id-1825'/>
+    <qualified-type-def type-id='type-id-1825' const='yes' id='type-id-1827'/>
+    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1829'/>
+    <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1832'/>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='352' id='type-id-1811'>
       <subrange length='11' type-id='type-id-106' id='type-id-1863'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='832' id='type-id-1853'>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='832' id='type-id-1824'>
       <subrange length='26' type-id='type-id-106' id='type-id-1864'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='1152' id='type-id-1852'>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='1152' id='type-id-1823'>
       <subrange length='36' type-id='type-id-106' id='type-id-1865'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1882' size-in-bits='832' id='type-id-1879'>
+    <array-type-def dimensions='1' type-id='type-id-1882' size-in-bits='832' id='type-id-1866'>
       <subrange length='13' type-id='type-id-106' id='type-id-1883'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='832' id='type-id-1881'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='832' id='type-id-1868'>
       <subrange length='13' type-id='type-id-106' id='type-id-1883'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1727' const='yes' id='type-id-1867'/>
-    <qualified-type-def type-id='type-id-1735' const='yes' id='type-id-1868'/>
-    <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1869'/>
-    <qualified-type-def type-id='type-id-1749' const='yes' id='type-id-1870'/>
-    <qualified-type-def type-id='type-id-1754' const='yes' id='type-id-1871'/>
-    <qualified-type-def type-id='type-id-1761' const='yes' id='type-id-1872'/>
-    <qualified-type-def type-id='type-id-1644' const='yes' id='type-id-1873'/>
-    <qualified-type-def type-id='type-id-1645' const='yes' id='type-id-1874'/>
-    <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1875'/>
-    <qualified-type-def type-id='type-id-1675' const='yes' id='type-id-1876'/>
-    <qualified-type-def type-id='type-id-1686' const='yes' id='type-id-1877'/>
-    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1878'/>
-    <pointer-type-def type-id='type-id-1884' size-in-bits='64' id='type-id-1880'/>
+    <qualified-type-def type-id='type-id-1727' const='yes' id='type-id-1870'/>
+    <qualified-type-def type-id='type-id-1735' const='yes' id='type-id-1871'/>
+    <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1872'/>
+    <qualified-type-def type-id='type-id-1749' const='yes' id='type-id-1873'/>
+    <qualified-type-def type-id='type-id-1754' const='yes' id='type-id-1874'/>
+    <qualified-type-def type-id='type-id-1761' const='yes' id='type-id-1875'/>
+    <qualified-type-def type-id='type-id-1645' const='yes' id='type-id-1876'/>
+    <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1877'/>
+    <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1878'/>
+    <qualified-type-def type-id='type-id-1675' const='yes' id='type-id-1879'/>
+    <qualified-type-def type-id='type-id-1686' const='yes' id='type-id-1880'/>
+    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1881'/>
+    <pointer-type-def type-id='type-id-1884' size-in-bits='64' id='type-id-1867'/>
     <pointer-type-def type-id='type-id-1885' size-in-bits='64' id='type-id-1882'/>
     <qualified-type-def type-id='type-id-209' const='yes' id='type-id-1884'/>
     <class-decl name='__locale_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1885'/>
@@ -30415,13 +30415,13 @@
       </data-member>
     </class-decl>
     <qualified-type-def type-id='type-id-499' const='yes' id='type-id-601'/>
-    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-579'/>
+    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-530'/>
     <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-1889'/>
     <qualified-type-def type-id='type-id-1889' const='yes' id='type-id-1890'/>
-    <qualified-type-def type-id='type-id-577' const='yes' id='type-id-1891'/>
+    <qualified-type-def type-id='type-id-528' const='yes' id='type-id-1891'/>
     <reference-type-def kind='lvalue' type-id='type-id-1891' size-in-bits='64' id='type-id-1892'/>
     <qualified-type-def type-id='type-id-616' const='yes' id='type-id-602'/>
-    <reference-type-def kind='lvalue' type-id='type-id-602' size-in-bits='64' id='type-id-581'/>
+    <reference-type-def kind='lvalue' type-id='type-id-602' size-in-bits='64' id='type-id-532'/>
     <pointer-type-def type-id='type-id-602' size-in-bits='64' id='type-id-1893'/>
     <qualified-type-def type-id='type-id-1893' const='yes' id='type-id-1894'/>
     <qualified-type-def type-id='type-id-617' const='yes' id='type-id-1895'/>
@@ -30430,10 +30430,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-1897' size-in-bits='64' id='type-id-1898'/>
     <qualified-type-def type-id='type-id-405' const='yes' id='type-id-1899'/>
     <pointer-type-def type-id='type-id-1899' size-in-bits='64' id='type-id-1900'/>
-    <qualified-type-def type-id='type-id-498' const='yes' id='type-id-576'/>
-    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-501'/>
+    <qualified-type-def type-id='type-id-498' const='yes' id='type-id-582'/>
+    <reference-type-def kind='lvalue' type-id='type-id-582' size-in-bits='64' id='type-id-501'/>
     <reference-type-def kind='lvalue' type-id='type-id-499' size-in-bits='64' id='type-id-1901'/>
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-578'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-529'/>
     <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-1902'/>
     <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-618'/>
     <reference-type-def kind='lvalue' type-id='type-id-405' size-in-bits='64' id='type-id-1903'/>
@@ -30454,42 +30454,42 @@
       <namespace-decl name='chrono'>
         <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='221' column='1' id='type-id-499'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-32' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-577'/>
+            <typedef-decl name='rep' type-id='type-id-32' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='223' column='1' id='type-id-528'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-577' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
+            <var-decl name='__r' type-id='type-id-528' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='350' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-579'/>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-530'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
               <parameter type-id='type-id-6' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration&lt;long int, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-580'/>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-531'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration&lt;long int, std::ratio&lt;1l&gt;, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-578' is-artificial='yes'/>
-              <parameter type-id='type-id-581'/>
+              <parameter type-id='type-id-529' is-artificial='yes'/>
+              <parameter type-id='type-id-532'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -30510,7 +30510,7 @@
           <member-function access='public'>
             <function-decl name='duration' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-618' is-artificial='yes'/>
-              <parameter type-id='type-id-581'/>
+              <parameter type-id='type-id-532'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -30524,7 +30524,7 @@
           <member-function access='public'>
             <function-decl name='duration&lt;long int, void&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-618' is-artificial='yes'/>
-              <parameter type-id='type-id-580'/>
+              <parameter type-id='type-id-531'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -30532,7 +30532,7 @@
         <class-decl name='__duration_cast_impl&lt;std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;, std::ratio&lt;1000000l, 1l&gt;, long int, false, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='147' column='1' id='type-id-1910'>
           <member-function access='public' static='yes'>
             <function-decl name='__cast&lt;long int, std::ratio&lt;1l&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-581'/>
+              <parameter type-id='type-id-532'/>
               <return type-id='type-id-499'/>
             </function-decl>
           </member-function>
@@ -30560,12 +30560,12 @@
         </class-decl>
         <typedef-decl name='microseconds' type-id='type-id-499' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='507' column='1' id='type-id-403'/>
         <function-decl name='duration_cast&lt;std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;, long int, std::ratio&lt;1l&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-581'/>
+          <parameter type-id='type-id-532'/>
           <return type-id='type-id-1907'/>
         </function-decl>
         <function-decl name='operator+&lt;long int, std::ratio&lt;1l&gt;, long int, std::ratio&lt;1l, 1000000l&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-581'/>
-          <parameter type-id='type-id-579'/>
+          <parameter type-id='type-id-532'/>
+          <parameter type-id='type-id-530'/>
           <return type-id='type-id-1909'/>
         </function-decl>
       </namespace-decl>
@@ -30625,9 +30625,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-888' size-in-bits='64' id='type-id-862'/>
     <qualified-type-def type-id='type-id-1911' const='yes' id='type-id-1912'/>
     <reference-type-def kind='lvalue' type-id='type-id-1912' size-in-bits='64' id='type-id-1913'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-932'/>
-    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-918'/>
-    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-1914'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-933'/>
+    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-924'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-1914'/>
     <qualified-type-def type-id='type-id-1914' const='yes' id='type-id-1915'/>
     <reference-type-def kind='lvalue' type-id='type-id-795' size-in-bits='64' id='type-id-1916'/>
     <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-861'/>
@@ -30636,75 +30636,75 @@
     <reference-type-def kind='lvalue' type-id='type-id-1911' size-in-bits='64' id='type-id-1917'/>
     <pointer-type-def type-id='type-id-1911' size-in-bits='64' id='type-id-1918'/>
     <qualified-type-def type-id='type-id-891' id='type-id-864'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-891'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-916'/>
-    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-917'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-915'/>
+    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-891'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-922'/>
+    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-923'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-921'/>
     <namespace-decl name='std'>
-      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='467' column='1' id='type-id-902'>
+      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='467' column='1' id='type-id-908'>
         <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='470' column='1' id='type-id-914'/>
+          <typedef-decl name='mutex_type' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='470' column='1' id='type-id-920'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_device' type-id='type-id-915' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='636' column='1'/>
+          <var-decl name='_M_device' type-id='type-id-921' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='636' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_owns' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='637' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
             <parameter type-id='type-id-810'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='487' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
             <parameter type-id='type-id-811'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-917'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-923'/>
             <parameter type-id='type-id-269'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
-            <parameter type-id='type-id-918'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
+            <parameter type-id='type-id-924'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_lock' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-916' is-artificial='yes'/>
+            <parameter type-id='type-id-922' is-artificial='yes'/>
             <parameter type-id='type-id-891'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -30885,12 +30885,12 @@
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='move&lt;unsigned int&amp;&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1459'/>
+        <parameter type-id='type-id-1458'/>
         <return type-id='type-id-1967'/>
       </function-decl>
       <function-decl name='swap&lt;unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1459'/>
-        <parameter type-id='type-id-1459'/>
+        <parameter type-id='type-id-1458'/>
+        <parameter type-id='type-id-1458'/>
         <return type-id='type-id-5'/>
       </function-decl>
     </namespace-decl>
@@ -31445,12 +31445,12 @@
     <qualified-type-def type-id='type-id-1540' const='yes' id='type-id-1983'/>
     <qualified-type-def type-id='type-id-1547' id='type-id-1984'/>
     <qualified-type-def type-id='type-id-1543' id='type-id-1985'/>
-    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1482'/>
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1293'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1293'/>
     <qualified-type-def type-id='type-id-1284' const='yes' id='type-id-1986'/>
     <qualified-type-def type-id='type-id-1287' const='yes' id='type-id-1987'/>
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1483'/>
-    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1312'/>
+    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1482'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1312'/>
     <qualified-type-def type-id='type-id-1304' const='yes' id='type-id-1988'/>
     <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1989'/>
     <qualified-type-def type-id='type-id-1990' const='yes' id='type-id-1991'/>
@@ -31477,12 +31477,12 @@
     <qualified-type-def type-id='type-id-1545' id='type-id-2017'/>
     <qualified-type-def type-id='type-id-1549' id='type-id-2018'/>
     <qualified-type-def type-id='type-id-1541' id='type-id-2019'/>
-    <qualified-type-def type-id='type-id-1503' id='type-id-1296'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-1502' id='type-id-1296'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1502'/>
     <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1298'/>
     <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-1292'/>
-    <qualified-type-def type-id='type-id-1504' id='type-id-1315'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1504'/>
+    <qualified-type-def type-id='type-id-1503' id='type-id-1315'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1503'/>
     <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-1317'/>
     <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1311'/>
     <pointer-type-def type-id='type-id-1990' size-in-bits='64' id='type-id-2020'/>
@@ -31503,7 +31503,7 @@
     <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2040'/>
     <qualified-type-def type-id='type-id-2040' const='yes' id='type-id-2041'/>
     <pointer-type-def type-id='type-id-2042' size-in-bits='64' id='type-id-2043'/>
-    <qualified-type-def type-id='type-id-1593' const='yes' id='type-id-2044'/>
+    <qualified-type-def type-id='type-id-1594' const='yes' id='type-id-2044'/>
     <namespace-decl name='std'>
       <class-decl name='basic_fstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4224' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='761' column='1' id='type-id-1990'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2045'/>
@@ -31671,7 +31671,7 @@
         </member-function>
       </class-decl>
       <class-decl name='basic_ofstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='588' column='1' id='type-id-2006'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1513'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1512'/>
         <member-type access='private'>
           <typedef-decl name='__filebuf_type' type-id='type-id-989' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='599' column='1' id='type-id-2038'/>
         </member-type>
@@ -32166,7 +32166,7 @@
         </member-function>
       </class-decl>
       <class-decl name='basic_ofstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='4096' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='588' column='1' id='type-id-2010'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1514'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1513'/>
         <member-type access='private'>
           <typedef-decl name='__filebuf_type' type-id='type-id-993' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='599' column='1' id='type-id-2042'/>
         </member-type>
@@ -32496,7 +32496,7 @@
         </member-function>
       </class-decl>
       <function-decl name='__check_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1343'/>
+        <parameter type-id='type-id-1342'/>
         <return type-id='type-id-2047'/>
       </function-decl>
       <function-decl name='operator!=&lt;__mbstate_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -32505,14 +32505,14 @@
         <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1359'/>
+        <parameter type-id='type-id-1358'/>
         <return type-id='type-id-2049'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2045'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1099'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1513'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1512'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2050' is-artificial='yes'/>
@@ -32601,7 +32601,7 @@
     <namespace-decl name='std'>
       <class-decl name='basic_iostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2046'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1514'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1513'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2051' is-artificial='yes'/>
@@ -32687,8 +32687,8 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-2047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-2049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-2047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1628' size-in-bits='64' id='type-id-2049'/>
     <reference-type-def kind='lvalue' type-id='type-id-2052' size-in-bits='64' id='type-id-2048'/>
     <qualified-type-def type-id='type-id-1516' const='yes' id='type-id-2052'/>
     <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-2050'/>
@@ -32892,10 +32892,10 @@
           <typedef-decl name='_Manager_type' type-id='type-id-2067' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1891' column='1' id='type-id-2226'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='_M_max_size' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1726' column='1'/>
+          <var-decl name='_M_max_size' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1726' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_M_max_align' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1727' column='1'/>
+          <var-decl name='_M_max_align' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1727' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_functor' type-id='type-id-2077' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1893' column='1'/>
@@ -33384,7 +33384,7 @@
           <typedef-decl name='_Base_ptr' type-id='type-id-2260' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='166' column='1' id='type-id-2259'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1501' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='159' column='1' id='type-id-2261'/>
+          <typedef-decl name='reference' type-id='type-id-1500' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='159' column='1' id='type-id-2261'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-123' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='160' column='1' id='type-id-2262'/>
@@ -33420,7 +33420,7 @@
           <typedef-decl name='reference' type-id='type-id-313' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='230' column='1' id='type-id-2266'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1665' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='231' column='1' id='type-id-2267'/>
+          <typedef-decl name='pointer' type-id='type-id-1593' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='231' column='1' id='type-id-2267'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='iterator' type-id='type-id-2109' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='233' column='1' id='type-id-2106'/>
@@ -33837,10 +33837,10 @@
           <typedef-decl name='pointer' type-id='type-id-123' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='59' column='1' id='type-id-2290'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1665' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='60' column='1' id='type-id-2291'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1593' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='60' column='1' id='type-id-2291'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1501' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2292'/>
+          <typedef-decl name='reference' type-id='type-id-1500' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='61' column='1' id='type-id-2292'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-313' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='62' column='1' id='type-id-2293'/>
@@ -33867,6 +33867,28 @@
         </member-function>
       </class-decl>
     </namespace-decl>
+    <namespace-decl name='std'>
+      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='90' column='1' id='type-id-2229'>
+        <member-type access='public'>
+          <typedef-decl name='_Base_ptr' type-id='type-id-2232' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='92' column='1' id='type-id-2260'/>
+        </member-type>
+        <member-type access='public'>
+          <typedef-decl name='_Const_Base_ptr' type-id='type-id-2234' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='93' column='1' id='type-id-2265'/>
+        </member-type>
+        <data-member access='public' layout-offset-in-bits='0'>
+          <var-decl name='_M_color' type-id='type-id-2294' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='95' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='64'>
+          <var-decl name='_M_parent' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='96' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='128'>
+          <var-decl name='_M_left' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='97' column='1'/>
+        </data-member>
+        <data-member access='public' layout-offset-in-bits='192'>
+          <var-decl name='_M_right' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='98' column='1'/>
+        </data-member>
+      </class-decl>
+    </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='logic_error' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/stdexcept' line='56' column='1' id='type-id-2269'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-37'/>
@@ -33875,42 +33897,42 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='logic_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='logic_error' mangled-name='_ZNSt11logic_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorC2ERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt11logic_error4whatEv' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt11logic_error4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2295' is-artificial='yes'/>
+            <parameter type-id='type-id-2296' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -33924,49 +33946,49 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='runtime_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC1ERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' mangled-name='_ZNSt13runtime_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' mangled-name='_ZNSt13runtime_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorD2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt13runtime_error4whatEv' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13runtime_error4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2297' is-artificial='yes'/>
+            <parameter type-id='type-id-2298' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-2298' size-in-bits='64' id='type-id-2234'/>
-    <pointer-type-def type-id='type-id-2299' size-in-bits='64' id='type-id-2270'/>
+    <pointer-type-def type-id='type-id-2299' size-in-bits='64' id='type-id-2234'/>
+    <pointer-type-def type-id='type-id-2300' size-in-bits='64' id='type-id-2270'/>
     <function-type size-in-bits='64' id='type-id-2064'>
       <parameter type-id='type-id-2079'/>
       <parameter type-id='type-id-2136'/>
@@ -33990,41 +34012,19 @@
     </function-type>
     <pointer-type-def type-id='type-id-2229' size-in-bits='64' id='type-id-2232'/>
     <pointer-type-def type-id='type-id-2217' size-in-bits='64' id='type-id-2218'/>
+    <qualified-type-def type-id='type-id-2229' const='yes' id='type-id-2299'/>
+    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-2300'/>
+    <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-2296'/>
+    <pointer-type-def type-id='type-id-2302' size-in-bits='64' id='type-id-2298'/>
     <namespace-decl name='std'>
-      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='90' column='1' id='type-id-2229'>
-        <member-type access='public'>
-          <typedef-decl name='_Base_ptr' type-id='type-id-2232' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='92' column='1' id='type-id-2260'/>
-        </member-type>
-        <member-type access='public'>
-          <typedef-decl name='_Const_Base_ptr' type-id='type-id-2234' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='93' column='1' id='type-id-2265'/>
-        </member-type>
-        <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_color' type-id='type-id-2300' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='95' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_parent' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='96' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_left' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='97' column='1'/>
-        </data-member>
-        <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='_M_right' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='98' column='1'/>
-        </data-member>
-      </class-decl>
-    </namespace-decl>
-    <qualified-type-def type-id='type-id-2229' const='yes' id='type-id-2298'/>
-    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-2299'/>
-    <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-2295'/>
-    <pointer-type-def type-id='type-id-2302' size-in-bits='64' id='type-id-2297'/>
-    <namespace-decl name='std'>
-      <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-2300'>
+      <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-2294'>
         <underlying-type type-id='type-id-21'/>
         <enumerator name='_S_red' value='0'/>
         <enumerator name='_S_black' value='1'/>
       </enum-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2294'/>
-    <pointer-type-def type-id='type-id-2245' size-in-bits='64' id='type-id-2296'/>
+    <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2295'/>
+    <pointer-type-def type-id='type-id-2245' size-in-bits='64' id='type-id-2297'/>
     <qualified-type-def type-id='type-id-2269' const='yes' id='type-id-2301'/>
     <qualified-type-def type-id='type-id-2245' const='yes' id='type-id-2302'/>
   </abi-instr>
@@ -34033,23 +34033,23 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-2303' size-in-bits='64' id='type-id-2304'/>
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-2305'/>
+    <qualified-type-def type-id='type-id-895' const='yes' id='type-id-2305'/>
     <reference-type-def kind='lvalue' type-id='type-id-2305' size-in-bits='64' id='type-id-2306'/>
     <qualified-type-def type-id='type-id-2307' const='yes' id='type-id-2308'/>
     <reference-type-def kind='lvalue' type-id='type-id-2308' size-in-bits='64' id='type-id-2309'/>
-    <qualified-type-def type-id='type-id-922' const='yes' id='type-id-2310'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-2310'/>
     <reference-type-def kind='lvalue' type-id='type-id-2310' size-in-bits='64' id='type-id-2311'/>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-919'/>
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-907'/>
-    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-2312'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-925'/>
+    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-898'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-2312'/>
     <reference-type-def kind='lvalue' type-id='type-id-2312' size-in-bits='64' id='type-id-2313'/>
     <qualified-type-def type-id='type-id-2314' const='yes' id='type-id-2315'/>
     <reference-type-def kind='lvalue' type-id='type-id-2315' size-in-bits='64' id='type-id-2316'/>
     <qualified-type-def type-id='type-id-2317' const='yes' id='type-id-2318'/>
     <reference-type-def kind='lvalue' type-id='type-id-2318' size-in-bits='64' id='type-id-2319'/>
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-930'/>
-    <reference-type-def kind='lvalue' type-id='type-id-930' size-in-bits='64' id='type-id-925'/>
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-2320'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-931'/>
+    <reference-type-def kind='lvalue' type-id='type-id-931' size-in-bits='64' id='type-id-915'/>
+    <qualified-type-def type-id='type-id-913' const='yes' id='type-id-2320'/>
     <reference-type-def kind='lvalue' type-id='type-id-2320' size-in-bits='64' id='type-id-2321'/>
     <qualified-type-def type-id='type-id-2322' const='yes' id='type-id-2323'/>
     <reference-type-def kind='lvalue' type-id='type-id-2323' size-in-bits='64' id='type-id-2324'/>
@@ -34059,13 +34059,13 @@
     <qualified-type-def type-id='type-id-797' const='yes' id='type-id-2329'/>
     <qualified-type-def type-id='type-id-787' const='yes' id='type-id-876'/>
     <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-790'/>
-    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-898'/>
-    <reference-type-def kind='lvalue' type-id='type-id-898' size-in-bits='64' id='type-id-885'/>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-2330'/>
+    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-904'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-2330'/>
     <qualified-type-def type-id='type-id-2330' const='yes' id='type-id-2331'/>
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-931'/>
-    <reference-type-def kind='lvalue' type-id='type-id-931' size-in-bits='64' id='type-id-912'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-2332'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-918'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-2332'/>
     <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-388'/>
     <qualified-type-def type-id='type-id-2333' const='yes' id='type-id-2334'/>
     <reference-type-def kind='lvalue' type-id='type-id-2334' size-in-bits='64' id='type-id-2335'/>
@@ -34074,16 +34074,16 @@
     <reference-type-def kind='lvalue' type-id='type-id-2338' size-in-bits='64' id='type-id-2339'/>
     <qualified-type-def type-id='type-id-2340' const='yes' id='type-id-2341'/>
     <reference-type-def kind='lvalue' type-id='type-id-2341' size-in-bits='64' id='type-id-2342'/>
-    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-2299'/>
-    <pointer-type-def type-id='type-id-2299' size-in-bits='64' id='type-id-2270'/>
-    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-899'/>
-    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-881'/>
+    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-2300'/>
+    <pointer-type-def type-id='type-id-2300' size-in-bits='64' id='type-id-2270'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-905'/>
+    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-881'/>
     <qualified-type-def type-id='type-id-2343' const='yes' id='type-id-2344'/>
     <reference-type-def kind='lvalue' type-id='type-id-2344' size-in-bits='64' id='type-id-2345'/>
-    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-920'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-896'/>
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-900'/>
-    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-886'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-926'/>
+    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-902'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-906'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-886'/>
     <qualified-type-def type-id='type-id-2346' const='yes' id='type-id-2347'/>
     <reference-type-def kind='lvalue' type-id='type-id-2347' size-in-bits='64' id='type-id-2348'/>
     <qualified-type-def type-id='type-id-796' const='yes' id='type-id-889'/>
@@ -34096,31 +34096,31 @@
     <pointer-type-def type-id='type-id-2353' size-in-bits='64' id='type-id-2355'/>
     <qualified-type-def type-id='type-id-2356' const='yes' id='type-id-2357'/>
     <reference-type-def kind='lvalue' type-id='type-id-2357' size-in-bits='64' id='type-id-2358'/>
-    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-2359'/>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-921'/>
+    <reference-type-def kind='lvalue' type-id='type-id-895' size-in-bits='64' id='type-id-2359'/>
+    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-911'/>
     <qualified-type-def type-id='type-id-2360' id='type-id-2361'/>
     <reference-type-def kind='lvalue' type-id='type-id-2307' size-in-bits='64' id='type-id-2360'/>
     <pointer-type-def type-id='type-id-2307' size-in-bits='64' id='type-id-2362'/>
     <qualified-type-def type-id='type-id-2363' id='type-id-2364'/>
-    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-2363'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-933'/>
-    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-908'/>
-    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-906'/>
-    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-2365'/>
+    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-2363'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-930'/>
+    <reference-type-def kind='lvalue' type-id='type-id-882' size-in-bits='64' id='type-id-899'/>
+    <pointer-type-def type-id='type-id-882' size-in-bits='64' id='type-id-897'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-2365'/>
     <qualified-type-def type-id='type-id-2366' id='type-id-2367'/>
     <reference-type-def kind='lvalue' type-id='type-id-2314' size-in-bits='64' id='type-id-2366'/>
     <pointer-type-def type-id='type-id-2314' size-in-bits='64' id='type-id-2368'/>
     <reference-type-def kind='lvalue' type-id='type-id-2317' size-in-bits='64' id='type-id-2369'/>
-    <qualified-type-def type-id='type-id-926' id='type-id-2370'/>
-    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-926'/>
-    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-924'/>
-    <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-2371'/>
+    <qualified-type-def type-id='type-id-916' id='type-id-2370'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-916'/>
+    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-914'/>
+    <reference-type-def kind='lvalue' type-id='type-id-913' size-in-bits='64' id='type-id-2371'/>
     <reference-type-def kind='lvalue' type-id='type-id-2322' size-in-bits='64' id='type-id-2372'/>
     <pointer-type-def type-id='type-id-2322' size-in-bits='64' id='type-id-2373'/>
     <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-2374'/>
     <pointer-type-def type-id='type-id-797' size-in-bits='64' id='type-id-798'/>
-    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-901'/>
-    <reference-type-def kind='lvalue' type-id='type-id-901' size-in-bits='64' id='type-id-884'/>
+    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-907'/>
+    <reference-type-def kind='lvalue' type-id='type-id-907' size-in-bits='64' id='type-id-884'/>
     <reference-type-def kind='lvalue' type-id='type-id-798' size-in-bits='64' id='type-id-2375'/>
     <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-2376'/>
     <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-789'/>
@@ -34129,8 +34129,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-2379'/>
     <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-2380'/>
     <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-2381'/>
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-911'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-919'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-917'/>
     <reference-type-def kind='lvalue' type-id='type-id-2333' size-in-bits='64' id='type-id-2382'/>
     <pointer-type-def type-id='type-id-2333' size-in-bits='64' id='type-id-2383'/>
     <reference-type-def kind='lvalue' type-id='type-id-2337' size-in-bits='64' id='type-id-2384'/>
@@ -34140,8 +34140,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-873'/>
     <reference-type-def kind='lvalue' type-id='type-id-2343' size-in-bits='64' id='type-id-2386'/>
     <pointer-type-def type-id='type-id-2343' size-in-bits='64' id='type-id-2387'/>
-    <reference-type-def kind='lvalue' type-id='type-id-879' size-in-bits='64' id='type-id-897'/>
-    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-895'/>
+    <reference-type-def kind='lvalue' type-id='type-id-879' size-in-bits='64' id='type-id-903'/>
+    <pointer-type-def type-id='type-id-879' size-in-bits='64' id='type-id-901'/>
     <reference-type-def kind='lvalue' type-id='type-id-868' size-in-bits='64' id='type-id-887'/>
     <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-883'/>
     <reference-type-def kind='lvalue' type-id='type-id-2346' size-in-bits='64' id='type-id-2388'/>
@@ -34198,29 +34198,29 @@
         </member-function>
       </class-decl>
       <class-decl name='shared_ptr&lt;std::__future_base::_State_base&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='93' column='1' id='type-id-879'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-900'/>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <parameter type-id='type-id-896'/>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
+            <parameter type-id='type-id-902'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-895' is-artificial='yes'/>
-            <parameter type-id='type-id-897'/>
+            <parameter type-id='type-id-901' is-artificial='yes'/>
+            <parameter type-id='type-id-903'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-894'>
+      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-900'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_ptr' type-id='type-id-749' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1061' column='1'/>
         </data-member>
@@ -34229,28 +34229,28 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
-            <parameter type-id='type-id-912'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-918'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-911' is-artificial='yes'/>
-            <parameter type-id='type-id-913'/>
+            <parameter type-id='type-id-917' is-artificial='yes'/>
+            <parameter type-id='type-id-919'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -34363,20 +34363,20 @@
         </member-function>
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-882'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-903'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-904'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-895'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-903' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-905'/>
+          <typedef-decl name='_Inherited' type-id='type-id-894' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-896'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
             <parameter type-id='type-id-884'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
@@ -34384,96 +34384,96 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
-            <parameter type-id='type-id-907'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
+            <parameter type-id='type-id-898'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-906' is-artificial='yes'/>
-            <parameter type-id='type-id-908'/>
+            <parameter type-id='type-id-897' is-artificial='yes'/>
+            <parameter type-id='type-id-899'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-903'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-894'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-742'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-922'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-912'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-742' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-923'/>
+          <typedef-decl name='_Inherited' type-id='type-id-742' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-913'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
-            <parameter type-id='type-id-925'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
+            <parameter type-id='type-id-915'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-924' is-artificial='yes'/>
-            <parameter type-id='type-id-926'/>
+            <parameter type-id='type-id-914' is-artificial='yes'/>
+            <parameter type-id='type-id-916'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-922'>
+      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-912'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <parameter type-id='type-id-885'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-933' is-artificial='yes'/>
+            <parameter type-id='type-id-930' is-artificial='yes'/>
             <parameter type-id='type-id-805'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-904'>
+      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-895'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <parameter type-id='type-id-884'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-921' is-artificial='yes'/>
+            <parameter type-id='type-id-911' is-artificial='yes'/>
             <parameter type-id='type-id-805'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34713,10 +34713,10 @@
         </member-function>
       </class-decl>
       <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-2314'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-903'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-894'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2307'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-903' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-2317'/>
+          <typedef-decl name='_Inherited' type-id='type-id-894' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-2317'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34818,7 +34818,7 @@
         <return type-id='type-id-2396'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-926'/>
+        <parameter type-id='type-id-916'/>
         <return type-id='type-id-2411'/>
       </function-decl>
       <function-decl name='get&lt;1ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -36222,41 +36222,41 @@
     <qualified-type-def type-id='type-id-419' const='yes' id='type-id-2509'/>
     <qualified-type-def type-id='type-id-348' const='yes' id='type-id-2510'/>
     <qualified-type-def type-id='type-id-449' const='yes' id='type-id-603'/>
-    <reference-type-def kind='lvalue' type-id='type-id-603' size-in-bits='64' id='type-id-537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-603' size-in-bits='64' id='type-id-543'/>
     <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-2511'/>
     <qualified-type-def type-id='type-id-447' const='yes' id='type-id-604'/>
-    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-547'/>
+    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-553'/>
     <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-2512'/>
     <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-2513'/>
-    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-542'/>
     <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-2514'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-546'/>
+    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-552'/>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-608'>
         <member-type access='public'>
           <typedef-decl name='iterator_category' type-id='type-id-413' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='152' column='1' id='type-id-2515'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-304' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-531'/>
+          <typedef-decl name='difference_type' type-id='type-id-304' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-537'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-533'/>
+          <typedef-decl name='pointer' type-id='type-id-415' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-539'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-414' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-535'/>
+          <typedef-decl name='reference' type-id='type-id-414' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-541'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-528'/>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, const char*, const char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-538'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, char*, char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-534'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, char, long int, const char*, const char&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-544'/>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const char*, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-609'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-504' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-541'/>
+          <typedef-decl name='difference_type' type-id='type-id-504' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-547'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-508' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-543'/>
+          <typedef-decl name='pointer' type-id='type-id-508' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-549'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-545'/>
+          <typedef-decl name='reference' type-id='type-id-506' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-551'/>
         </member-type>
       </class-decl>
       <function-decl name='__iterator_category&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -36267,12 +36267,12 @@
         <parameter type-id='type-id-293'/>
         <parameter type-id='type-id-293'/>
         <parameter type-id='type-id-373'/>
-        <return type-id='type-id-531'/>
+        <return type-id='type-id-537'/>
       </function-decl>
       <function-decl name='distance&lt;__gnu_cxx::__normal_iterator&lt;char*, std::basic_string&lt;char&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-293'/>
         <parameter type-id='type-id-293'/>
-        <return type-id='type-id-531'/>
+        <return type-id='type-id-537'/>
       </function-decl>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4' name='__lhs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='694' column='1'/>
@@ -36376,41 +36376,41 @@
     <qualified-type-def type-id='type-id-460' const='yes' id='type-id-2538'/>
     <qualified-type-def type-id='type-id-351' const='yes' id='type-id-2539'/>
     <qualified-type-def type-id='type-id-488' const='yes' id='type-id-605'/>
-    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-563'/>
     <pointer-type-def type-id='type-id-605' size-in-bits='64' id='type-id-2540'/>
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-573'/>
     <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-2541'/>
     <reference-type-def kind='lvalue' type-id='type-id-488' size-in-bits='64' id='type-id-2542'/>
-    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-556'/>
+    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-562'/>
     <reference-type-def kind='lvalue' type-id='type-id-490' size-in-bits='64' id='type-id-2543'/>
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-566'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-572'/>
     <namespace-decl name='std'>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-611'>
         <member-type access='public'>
           <typedef-decl name='iterator_category' type-id='type-id-416' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='152' column='1' id='type-id-2544'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-309' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-561'/>
+          <typedef-decl name='difference_type' type-id='type-id-309' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-567'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-418' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-563'/>
+          <typedef-decl name='pointer' type-id='type-id-418' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-569'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-417' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-565'/>
+          <typedef-decl name='reference' type-id='type-id-417' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-571'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, wchar_t*, wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-558'/>
-      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, const wchar_t*, const wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-548'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, wchar_t*, wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-564'/>
+      <class-decl name='iterator&lt;std::random_access_iterator_tag, wchar_t, long int, const wchar_t*, const wchar_t&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-554'/>
       <class-decl name='__iterator_traits&lt;__gnu_cxx::__normal_iterator&lt;const wchar_t*, std::basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='150' column='1' id='type-id-610'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-551'/>
+          <typedef-decl name='difference_type' type-id='type-id-512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='154' column='1' id='type-id-557'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-553'/>
+          <typedef-decl name='pointer' type-id='type-id-516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='155' column='1' id='type-id-559'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-555'/>
+          <typedef-decl name='reference' type-id='type-id-514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='156' column='1' id='type-id-561'/>
         </member-type>
       </class-decl>
       <function-decl name='__iterator_category&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -36421,12 +36421,12 @@
         <parameter type-id='type-id-296'/>
         <parameter type-id='type-id-296'/>
         <parameter type-id='type-id-373'/>
-        <return type-id='type-id-561'/>
+        <return type-id='type-id-567'/>
       </function-decl>
       <function-decl name='distance&lt;__gnu_cxx::__normal_iterator&lt;wchar_t*, std::basic_string&lt;wchar_t&gt; &gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-296'/>
         <parameter type-id='type-id-296'/>
-        <return type-id='type-id-561'/>
+        <return type-id='type-id-567'/>
       </function-decl>
       <function-decl name='operator+&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' mangled-name='_ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_EPKS3_RKS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_EPKS3_RKS6_@@GLIBCXX_3.4'>
         <parameter type-id='type-id-395' name='__lhs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.tcc' line='694' column='1'/>
@@ -36461,7 +36461,7 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='64' id='type-id-2546'>
-      <subrange length='8' type-id='type-id-106' id='type-id-1329'/>
+      <subrange length='8' type-id='type-id-106' id='type-id-1515'/>
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-2547' size-in-bits='64' id='type-id-2548'/>
     <pointer-type-def type-id='type-id-2547' size-in-bits='64' id='type-id-2549'/>
@@ -36582,8 +36582,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-2700' size-in-bits='64' id='type-id-2701'/>
     <qualified-type-def type-id='type-id-2702' const='yes' id='type-id-2703'/>
     <reference-type-def kind='lvalue' type-id='type-id-2703' size-in-bits='64' id='type-id-2704'/>
-    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1376'/>
-    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-2705'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1375'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-2705'/>
     <reference-type-def kind='lvalue' type-id='type-id-716' size-in-bits='64' id='type-id-2706'/>
     <reference-type-def kind='lvalue' type-id='type-id-2699' size-in-bits='64' id='type-id-2707'/>
     <pointer-type-def type-id='type-id-2699' size-in-bits='64' id='type-id-2708'/>
@@ -37282,403 +37282,403 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-1882' size-in-bits='832' id='type-id-1879'>
+    <array-type-def dimensions='1' type-id='type-id-1882' size-in-bits='832' id='type-id-1866'>
       <subrange length='13' type-id='type-id-106' id='type-id-1883'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='832' id='type-id-1881'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='832' id='type-id-1868'>
       <subrange length='13' type-id='type-id-106' id='type-id-1883'/>
     </array-type-def>
     <class-decl name='__locale_struct' size-in-bits='1856' is-struct='yes' visibility='default' filepath='/usr/include/xlocale.h' line='28' column='1' id='type-id-1803'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__locales' type-id='type-id-1879' visibility='default' filepath='/usr/include/xlocale.h' line='31' column='1'/>
+        <var-decl name='__locales' type-id='type-id-1866' visibility='default' filepath='/usr/include/xlocale.h' line='31' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='__ctype_b' type-id='type-id-1880' visibility='default' filepath='/usr/include/xlocale.h' line='34' column='1'/>
+        <var-decl name='__ctype_b' type-id='type-id-1867' visibility='default' filepath='/usr/include/xlocale.h' line='34' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='__ctype_tolower' type-id='type-id-1665' visibility='default' filepath='/usr/include/xlocale.h' line='35' column='1'/>
+        <var-decl name='__ctype_tolower' type-id='type-id-1593' visibility='default' filepath='/usr/include/xlocale.h' line='35' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__ctype_toupper' type-id='type-id-1665' visibility='default' filepath='/usr/include/xlocale.h' line='36' column='1'/>
+        <var-decl name='__ctype_toupper' type-id='type-id-1593' visibility='default' filepath='/usr/include/xlocale.h' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='__names' type-id='type-id-1881' visibility='default' filepath='/usr/include/xlocale.h' line='39' column='1'/>
+        <var-decl name='__names' type-id='type-id-1868' visibility='default' filepath='/usr/include/xlocale.h' line='39' column='1'/>
       </data-member>
     </class-decl>
     <typedef-decl name='__locale_t' type-id='type-id-1802' filepath='/usr/include/xlocale.h' line='40' column='1' id='type-id-1667'/>
     <pointer-type-def type-id='type-id-1885' size-in-bits='64' id='type-id-1882'/>
     <pointer-type-def type-id='type-id-1803' size-in-bits='64' id='type-id-1802'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1665'/>
-    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1624'/>
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-1343'/>
-    <qualified-type-def type-id='type-id-1338' const='yes' id='type-id-1625'/>
-    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1350'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1350' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-1593'/>
+    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1625'/>
+    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1342'/>
     <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1626'/>
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1627'/>
-    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1359'/>
-    <qualified-type-def type-id='type-id-1356' const='yes' id='type-id-1628'/>
-    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-1366'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1366' size-in-bits='64' id='type-id-1367'/>
+    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
+    <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1627'/>
+    <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1344'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
+    <qualified-type-def type-id='type-id-1306' const='yes' id='type-id-1628'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-1358'/>
     <qualified-type-def type-id='type-id-1355' const='yes' id='type-id-1629'/>
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1361' size-in-bits='64' id='type-id-1362'/>
-    <qualified-type-def type-id='type-id-1341' const='yes' id='type-id-1637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1439'/>
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1410'/>
+    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1365'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
+    <qualified-type-def type-id='type-id-1354' const='yes' id='type-id-1630'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-1360'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1360' size-in-bits='64' id='type-id-1361'/>
+    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-1638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1638' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1409'/>
     <qualified-type-def type-id='type-id-209' const='yes' id='type-id-1884'/>
-    <pointer-type-def type-id='type-id-1884' size-in-bits='64' id='type-id-1880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1340' size-in-bits='64' id='type-id-1643'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1525'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1539'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-1347'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1352'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1344'/>
-    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-1363'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1368'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1368' size-in-bits='64' id='type-id-1369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-1399'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1884' size-in-bits='64' id='type-id-1867'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1339' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1525'/>
+    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-1539'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1338' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1362'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1362' size-in-bits='64' id='type-id-1363'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1367'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1367' size-in-bits='64' id='type-id-1368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1356' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-1437'/>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_locale' type-id='type-id-1667' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='63' column='1' id='type-id-1340'/>
+      <typedef-decl name='__c_locale' type-id='type-id-1667' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale.h' line='63' column='1' id='type-id-1339'/>
       <class-decl name='codecvt&lt;char, char, __mbstate_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='341' column='1' id='type-id-1286'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1336'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1335'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='346' column='1' id='type-id-1337'/>
+          <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='346' column='1' id='type-id-1336'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='347' column='1' id='type-id-1338'/>
+          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='347' column='1' id='type-id-1337'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='348' column='1' id='type-id-1339'/>
+          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='348' column='1' id='type-id-1338'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='351' column='1'/>
+          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='351' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7codecvtIcc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='32' column='1' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7codecvtIcc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='32' column='1' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIcc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIcc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1341' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE6do_outERS0_PKcS4_RS4_PcS6_RS6_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE6do_outERS0_PKcS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1345'/>
             <parameter type-id='type-id-1345'/>
             <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1346'/>
             <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1348'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_unshift' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1346'/>
             <parameter type-id='type-id-1347'/>
-            <parameter type-id='type-id-1348'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE5do_inERS0_PKcS4_RS4_PcS6_RS6_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE5do_inERS0_PKcS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1350'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1349'/>
             <parameter type-id='type-id-1350'/>
             <parameter type-id='type-id-1351'/>
+            <parameter type-id='type-id-1351'/>
             <parameter type-id='type-id-1352'/>
-            <parameter type-id='type-id-1352'/>
-            <parameter type-id='type-id-1353'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_encoding' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE11do_encodingEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE11do_encodingEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_length' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE9do_lengthERS0_PKcS4_m' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE9do_lengthERS0_PKcS4_m@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
-            <parameter type-id='type-id-1344'/>
-            <parameter type-id='type-id-1350'/>
-            <parameter type-id='type-id-1350'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1349'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_max_length' mangled-name='_ZNKSt7codecvtIcc11__mbstate_tE13do_max_lengthEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIcc11__mbstate_tE13do_max_lengthEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='codecvt&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='399' column='1' id='type-id-1306'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1354'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1353'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='404' column='1' id='type-id-1355'/>
+          <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='404' column='1' id='type-id-1354'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='405' column='1' id='type-id-1356'/>
+          <typedef-decl name='extern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='405' column='1' id='type-id-1355'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='406' column='1' id='type-id-1357'/>
+          <typedef-decl name='state_type' type-id='type-id-960' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='406' column='1' id='type-id-1356'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='409' column='1'/>
+          <var-decl name='_M_c_locale_codecvt' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='409' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7codecvtIwc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='35' column='1' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7codecvtIwc11__mbstate_tE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='35' column='1' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt' mangled-name='_ZNSt7codecvtIwc11__mbstate_tED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7codecvtIwc11__mbstate_tED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1360'/>
             <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_out' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/codecvt_members.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1360'/>
             <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1361'/>
             <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_unshift' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE10do_unshiftERS0_PcS3_RS3_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1363'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1362'/>
+            <parameter type-id='type-id-1362'/>
             <parameter type-id='type-id-1363'/>
-            <parameter type-id='type-id-1364'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-1366'/>
             <parameter type-id='type-id-1367'/>
+            <parameter type-id='type-id-1367'/>
             <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1369'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_in' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/codecvt_members.cc' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-1366'/>
             <parameter type-id='type-id-1367'/>
+            <parameter type-id='type-id-1367'/>
             <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1368'/>
-            <parameter type-id='type-id-1369'/>
-            <return type-id='type-id-1349'/>
+            <return type-id='type-id-1348'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_encoding' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE11do_encodingEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE11do_encodingEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_always_noconv' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv' filepath='../../../.././libstdc++-v3/src/c++98/codecvt.cc' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE16do_always_noconvEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_length' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE9do_lengthERS0_PKcS4_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE9do_lengthERS0_PKcS4_m@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1360'/>
-            <parameter type-id='type-id-1366'/>
-            <parameter type-id='type-id-1366'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1359'/>
+            <parameter type-id='type-id-1365'/>
+            <parameter type-id='type-id-1365'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_max_length' mangled-name='_ZNKSt7codecvtIwc11__mbstate_tE13do_max_lengthEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE13do_max_lengthEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='locale' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='64' column='1' id='type-id-1170'>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='306' column='1' id='type-id-1397'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='306' column='1' id='type-id-1396'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='_S_categories_size' value='12'/>
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='facet' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='340' column='1' id='type-id-1370'>
+          <class-decl name='facet' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='340' column='1' id='type-id-1369'>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='_M_refcount' type-id='type-id-450' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='346' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_c_locale' type-id='type-id-1340' mangled-name='_ZNSt6locale5facet11_S_c_localeE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='191' column='1'/>
+              <var-decl name='_S_c_locale' type-id='type-id-1339' mangled-name='_ZNSt6locale5facet11_S_c_localeE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='191' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_c_name' type-id='type-id-1398' mangled-name='_ZNSt6locale5facet9_S_c_nameE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='193' column='1'/>
+              <var-decl name='_S_c_name' type-id='type-id-1397' mangled-name='_ZNSt6locale5facet9_S_c_nameE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='193' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
               <var-decl name='_S_once' type-id='type-id-627' mangled-name='_ZNSt6locale5facet7_S_onceE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='196' column='1'/>
             </data-member>
             <member-function access='protected' constructor='yes'>
               <function-decl name='facet' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='facet' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='420' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
-                <parameter type-id='type-id-1400'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
+                <parameter type-id='type-id-1399'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_get_c_locale' mangled-name='_ZNSt6locale5facet15_S_get_c_localeEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet15_S_get_c_localeEv@@GLIBCXX_3.4'>
-                <return type-id='type-id-1340'/>
+                <return type-id='type-id-1339'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
@@ -37688,41 +37688,41 @@
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_create_c_locale' mangled-name='_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet18_S_create_c_localeERP15__locale_structPKcS2_@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
                 <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='130' column='1'/>
-                <parameter type-id='type-id-1340' name='__old' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='131' column='1'/>
+                <parameter type-id='type-id-1339' name='__old' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='131' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_destroy_c_locale' mangled-name='_ZNSt6locale5facet19_S_destroy_c_localeERP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet19_S_destroy_c_localeERP15__locale_struct@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='143' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_clone_c_locale' mangled-name='_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facet17_S_clone_c_localeERP15__locale_struct@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1401' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1'/>
-                <return type-id='type-id-1340'/>
+                <parameter type-id='type-id-1400' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='150' column='1'/>
+                <return type-id='type-id-1339'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD0Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='protected' destructor='yes' vtable-offset='-1'>
               <function-decl name='~facet' mangled-name='_ZNSt6locale5facetD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5facetD1Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1399' is-artificial='yes'/>
+                <parameter type-id='type-id-1398' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -37730,54 +37730,54 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='477' column='1' id='type-id-1402'>
+          <class-decl name='_Impl' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='477' column='1' id='type-id-1401'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_refcount' type-id='type-id-450' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='497' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
-              <var-decl name='_M_facets' type-id='type-id-1403' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='498' column='1'/>
+              <var-decl name='_M_facets' type-id='type-id-1402' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='498' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='128'>
               <var-decl name='_M_facets_size' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='499' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='192'>
-              <var-decl name='_M_caches' type-id='type-id-1403' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='500' column='1'/>
+              <var-decl name='_M_caches' type-id='type-id-1402' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='500' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='256'>
               <var-decl name='_M_names' type-id='type-id-301' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='501' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_ctype' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl11_S_id_ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='502' column='1'/>
+              <var-decl name='_S_id_ctype' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl11_S_id_ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='502' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_numeric' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl13_S_id_numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='503' column='1'/>
+              <var-decl name='_S_id_numeric' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl13_S_id_numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='503' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_collate' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl13_S_id_collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='504' column='1'/>
+              <var-decl name='_S_id_collate' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl13_S_id_collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='504' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_time' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl10_S_id_timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='505' column='1'/>
+              <var-decl name='_S_id_time' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl10_S_id_timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='505' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_monetary' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl14_S_id_monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='506' column='1'/>
+              <var-decl name='_S_id_monetary' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl14_S_id_monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='506' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_id_messages' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl14_S_id_messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='507' column='1'/>
+              <var-decl name='_S_id_messages' type-id='type-id-1403' mangled-name='_ZNSt6locale5_Impl14_S_id_messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='507' column='1'/>
             </data-member>
             <data-member access='private' static='yes'>
-              <var-decl name='_S_facet_categories' type-id='type-id-1405' mangled-name='_ZNSt6locale5_Impl19_S_facet_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='508' column='1'/>
+              <var-decl name='_S_facet_categories' type-id='type-id-1404' mangled-name='_ZNSt6locale5_Impl19_S_facet_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='508' column='1'/>
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
@@ -37785,278 +37785,278 @@
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' destructor='yes'>
               <function-decl name='~_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' destructor='yes'>
               <function-decl name='~_Impl' mangled-name='_ZNSt6locale5_ImplD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplD1Ev@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-6' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2ERKS0_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC1ERKS0_m@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1407'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1406'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_cache' mangled-name='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm@@GLIBCXX_3.4.7'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1409' name='__cache' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1408' name='__cache' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
                 <parameter type-id='type-id-96' name='__index' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='393' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_facet' mangled-name='_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1410' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
-                <parameter type-id='type-id-1409' name='__fp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1409' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
+                <parameter type-id='type-id-1408' name='__fp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='314' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_facet' mangled-name='_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
-                <parameter type-id='type-id-1410' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
+                <parameter type-id='type-id-1409' name='__idp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='303' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_category' mangled-name='_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='294' column='1'/>
-                <parameter type-id='type-id-1412' name='__idpp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='295' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='294' column='1'/>
+                <parameter type-id='type-id-1411' name='__idpp' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='295' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::ctype&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1377'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1376'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1342'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1341'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::numpunct&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1413'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1412'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1414'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1413'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1415'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1414'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::collate&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1416'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1415'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;char, false&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1417'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1416'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;char, true&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1418'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1417'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1419'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1418'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1420'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1419'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::__timepunct&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1421'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1420'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1422'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1421'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1423'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1422'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::messages&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1424'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1423'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1389'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1388'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1358'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1357'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::numpunct&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1425'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1424'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1426'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1425'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1427'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1426'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::collate&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1428'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1427'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;wchar_t, false&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1429'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1428'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::moneypunct&lt;wchar_t, true&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1430'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1429'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1431'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1430'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::money_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1432'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1431'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::__timepunct&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1433'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1432'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1434'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1433'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::time_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1435'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1434'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_init_facet&lt;std::messages&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
-                <parameter type-id='type-id-1436'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
+                <parameter type-id='type-id-1435'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2Em@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt6locale5_ImplC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_ImplC2EPKcm@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1406' is-artificial='yes'/>
+                <parameter type-id='type-id-1405' is-artificial='yes'/>
                 <parameter type-id='type-id-4'/>
                 <parameter type-id='type-id-96'/>
                 <return type-id='type-id-5'/>
@@ -38064,19 +38064,19 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_categories' mangled-name='_ZNSt6locale5_Impl21_M_replace_categoriesEPKS0_i' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale5_Impl21_M_replace_categoriesEPKS0_i@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1408' name='this' is-artificial='yes'/>
-                <parameter type-id='type-id-1411' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
-                <parameter type-id='type-id-1437' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
+                <parameter type-id='type-id-1407' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1410' name='__imp' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
+                <parameter type-id='type-id-1436' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='291' column='1'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='category' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='69' column='1' id='type-id-1437'/>
+          <typedef-decl name='category' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='69' column='1' id='type-id-1436'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='438' column='1' id='type-id-1341'>
+          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='438' column='1' id='type-id-1340'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_index' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='455' column='1'/>
             </data-member>
@@ -38085,159 +38085,159 @@
             </data-member>
             <member-function access='private' constructor='yes'>
               <function-decl name='id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1438' is-artificial='yes'/>
-                <parameter type-id='type-id-1439'/>
+                <parameter type-id='type-id-1437' is-artificial='yes'/>
+                <parameter type-id='type-id-1438'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1438' is-artificial='yes'/>
+                <parameter type-id='type-id-1437' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='_M_id' mangled-name='_ZNKSt6locale2id5_M_idEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale2id5_M_idEv@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-1440' name='this' is-artificial='yes'/>
+                <parameter type-id='type-id-1439' name='this' is-artificial='yes'/>
                 <return type-id='type-id-96'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='none' type-id='type-id-1441' mangled-name='_ZNSt6locale4noneE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='100' column='1' elf-symbol-id='_ZNSt6locale4noneE@@GLIBCXX_3.4'/>
+          <var-decl name='none' type-id='type-id-1440' mangled-name='_ZNSt6locale4noneE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='100' column='1' elf-symbol-id='_ZNSt6locale4noneE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='ctype' type-id='type-id-1441' mangled-name='_ZNSt6locale5ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='101' column='1' elf-symbol-id='_ZNSt6locale5ctypeE@@GLIBCXX_3.4'/>
+          <var-decl name='ctype' type-id='type-id-1440' mangled-name='_ZNSt6locale5ctypeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='101' column='1' elf-symbol-id='_ZNSt6locale5ctypeE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='numeric' type-id='type-id-1441' mangled-name='_ZNSt6locale7numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='102' column='1' elf-symbol-id='_ZNSt6locale7numericE@@GLIBCXX_3.4'/>
+          <var-decl name='numeric' type-id='type-id-1440' mangled-name='_ZNSt6locale7numericE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='102' column='1' elf-symbol-id='_ZNSt6locale7numericE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='collate' type-id='type-id-1441' mangled-name='_ZNSt6locale7collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='103' column='1' elf-symbol-id='_ZNSt6locale7collateE@@GLIBCXX_3.4'/>
+          <var-decl name='collate' type-id='type-id-1440' mangled-name='_ZNSt6locale7collateE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='103' column='1' elf-symbol-id='_ZNSt6locale7collateE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='time' type-id='type-id-1441' mangled-name='_ZNSt6locale4timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='104' column='1' elf-symbol-id='_ZNSt6locale4timeE@@GLIBCXX_3.4'/>
+          <var-decl name='time' type-id='type-id-1440' mangled-name='_ZNSt6locale4timeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='104' column='1' elf-symbol-id='_ZNSt6locale4timeE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='monetary' type-id='type-id-1441' mangled-name='_ZNSt6locale8monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='105' column='1' elf-symbol-id='_ZNSt6locale8monetaryE@@GLIBCXX_3.4'/>
+          <var-decl name='monetary' type-id='type-id-1440' mangled-name='_ZNSt6locale8monetaryE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='105' column='1' elf-symbol-id='_ZNSt6locale8monetaryE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='messages' type-id='type-id-1441' mangled-name='_ZNSt6locale8messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='106' column='1' elf-symbol-id='_ZNSt6locale8messagesE@@GLIBCXX_3.4'/>
+          <var-decl name='messages' type-id='type-id-1440' mangled-name='_ZNSt6locale8messagesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='106' column='1' elf-symbol-id='_ZNSt6locale8messagesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='all' type-id='type-id-1441' mangled-name='_ZNSt6locale3allE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='108' column='1' elf-symbol-id='_ZNSt6locale3allE@@GLIBCXX_3.4'/>
+          <var-decl name='all' type-id='type-id-1440' mangled-name='_ZNSt6locale3allE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='108' column='1' elf-symbol-id='_ZNSt6locale3allE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1406' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='282' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1405' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='282' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_classic' type-id='type-id-1406' mangled-name='_ZNSt6locale10_S_classicE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='285' column='1'/>
+          <var-decl name='_S_classic' type-id='type-id-1405' mangled-name='_ZNSt6locale10_S_classicE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='285' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_global' type-id='type-id-1406' mangled-name='_ZNSt6locale9_S_globalE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='288' column='1'/>
+          <var-decl name='_S_global' type-id='type-id-1405' mangled-name='_ZNSt6locale9_S_globalE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='288' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_categories' type-id='type-id-1442' mangled-name='_ZNSt6locale13_S_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='294' column='1'/>
+          <var-decl name='_S_categories' type-id='type-id-1441' mangled-name='_ZNSt6locale13_S_categoriesE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='294' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='_S_once' type-id='type-id-627' mangled-name='_ZNSt6locale7_S_onceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='309' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-1220'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <parameter type-id='type-id-1406'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
+            <parameter type-id='type-id-1405'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2EPNS_5_ImplE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPNS_5_ImplE@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <parameter type-id='type-id-1406'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
+            <parameter type-id='type-id-1405'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='name' mangled-name='_ZNKSt6locale4nameEv' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale4nameEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1443' name='this' is-artificial='yes'/>
             <return type-id='type-id-355'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt6localeeqERKS_' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6localeeqERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1443' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__rhs' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='94' column='1'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_normalize_category' mangled-name='_ZNSt6locale21_S_normalize_categoryEi' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale21_S_normalize_categoryEi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1437'/>
-            <return type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
+            <return type-id='type-id-1436'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt6localeaSERKS_' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeaSERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1445' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__other' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='115' column='1'/>
             <return type-id='type-id-1220'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~locale' mangled-name='_ZNSt6localeD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -38249,7 +38249,7 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -38261,42 +38261,42 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2EPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1EPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_coalesce' mangled-name='_ZNSt6locale11_M_coalesceERKS_S1_i' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6locale11_M_coalesceERKS_S1_i@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1445' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__base' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1'/>
             <parameter type-id='type-id-1175' name='__add' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='160' column='1'/>
-            <parameter type-id='type-id-1437' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='161' column='1'/>
+            <parameter type-id='type-id-1436' name='__cat' filepath='../../../.././libstdc++-v3/src/c++98/localename.cc' line='161' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_S1_i' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC2ERKS_S1_i@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-1220'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='locale' mangled-name='_ZNSt6localeC2ERKS_PKci' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeC1ERKS_PKci@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1442' is-artificial='yes'/>
             <parameter type-id='type-id-1220'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1437'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='codecvt_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='47' column='1' id='type-id-1520'>
         <member-type access='private'>
-          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1349'>
+          <enum-decl name='result' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='50' column='1' id='type-id-1348'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
@@ -38305,11 +38305,11 @@
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='__codecvt_abstract_base&lt;char, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1336'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__codecvt_abstract_base&lt;char, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1335'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1520'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-1349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1521'/>
+          <typedef-decl name='result' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1521'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='75' column='1' id='type-id-1522'/>
@@ -38413,11 +38413,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1354'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__codecvt_abstract_base&lt;wchar_t, char, __mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='69' column='1' id='type-id-1353'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1520'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-1349' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1365'/>
+          <typedef-decl name='result' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='74' column='1' id='type-id-1364'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='75' column='1' id='type-id-1536'/>
@@ -38466,7 +38466,7 @@
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1545'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -38476,7 +38476,7 @@
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1544'/>
             <parameter type-id='type-id-1545'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -38489,7 +38489,7 @@
             <parameter type-id='type-id-1548'/>
             <parameter type-id='type-id-1548'/>
             <parameter type-id='type-id-1549'/>
-            <return type-id='type-id-1365'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -38532,21 +38532,21 @@
     <type-decl name='complex double' size-in-bits='128' id='type-id-2767'/>
     <type-decl name='complex float' size-in-bits='64' id='type-id-2768'/>
     <type-decl name='complex long double' size-in-bits='256' id='type-id-2769'/>
-    <array-type-def dimensions='1' type-id='type-id-1412' size-in-bits='infinite' id='type-id-1405'>
+    <array-type-def dimensions='1' type-id='type-id-1411' size-in-bits='infinite' id='type-id-1404'>
       <subrange length='infinite' id='type-id-583'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-1410' size-in-bits='infinite' id='type-id-1404'>
+    <array-type-def dimensions='1' type-id='type-id-1409' size-in-bits='infinite' id='type-id-1403'>
       <subrange length='infinite' id='type-id-583'/>
     </array-type-def>
-    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1619'/>
-    <qualified-type-def type-id='type-id-1619' const='yes' id='type-id-1442'/>
+    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1620'/>
+    <qualified-type-def type-id='type-id-1620' const='yes' id='type-id-1441'/>
     <qualified-type-def type-id='type-id-281' const='yes' id='type-id-2770'/>
     <reference-type-def kind='lvalue' type-id='type-id-2770' size-in-bits='64' id='type-id-2771'/>
     <qualified-type-def type-id='type-id-411' const='yes' id='type-id-2772'/>
     <reference-type-def kind='lvalue' type-id='type-id-2772' size-in-bits='64' id='type-id-2773'/>
     <qualified-type-def type-id='type-id-412' const='yes' id='type-id-2774'/>
     <reference-type-def kind='lvalue' type-id='type-id-2774' size-in-bits='64' id='type-id-2775'/>
-    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1792'/>
+    <qualified-type-def type-id='type-id-1381' const='yes' id='type-id-1792'/>
     <pointer-type-def type-id='type-id-1792' size-in-bits='64' id='type-id-1552'/>
     <qualified-type-def type-id='type-id-1552' const='yes' id='type-id-2776'/>
     <qualified-type-def type-id='type-id-436' id='type-id-431'/>
@@ -38583,44 +38583,44 @@
     <pointer-type-def type-id='type-id-2810' size-in-bits='64' id='type-id-2813'/>
     <qualified-type-def type-id='type-id-2813' const='yes' id='type-id-2814'/>
     <qualified-type-def type-id='type-id-2815' const='yes' id='type-id-2816'/>
-    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-2817'/>
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1392'/>
-    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1498'/>
-    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-2818'/>
+    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1633'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1633' size-in-bits='64' id='type-id-2817'/>
+    <pointer-type-def type-id='type-id-1633' size-in-bits='64' id='type-id-1391'/>
+    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-2818'/>
     <qualified-type-def type-id='type-id-2818' const='yes' id='type-id-2819'/>
     <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1164'/>
     <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1165'/>
     <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1166'/>
     <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1167'/>
-    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1500'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1220'/>
-    <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-1634'/>
-    <qualified-type-def type-id='type-id-1402' const='yes' id='type-id-1635'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1635' size-in-bits='64' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1411'/>
-    <qualified-type-def type-id='type-id-1437' const='yes' id='type-id-1441'/>
-    <qualified-type-def type-id='type-id-1370' const='yes' id='type-id-1636'/>
-    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-1409'/>
-    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1403'/>
-    <qualified-type-def type-id='type-id-1410' const='yes' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-1412'/>
-    <qualified-type-def type-id='type-id-1464' id='type-id-1208'/>
-    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-1464'/>
-    <qualified-type-def type-id='type-id-1463' id='type-id-1207'/>
-    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1463'/>
-    <qualified-type-def type-id='type-id-1465' id='type-id-1209'/>
-    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1220'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1635'/>
+    <qualified-type-def type-id='type-id-1401' const='yes' id='type-id-1636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-1636' size-in-bits='64' id='type-id-1410'/>
+    <qualified-type-def type-id='type-id-1436' const='yes' id='type-id-1440'/>
+    <qualified-type-def type-id='type-id-1369' const='yes' id='type-id-1637'/>
+    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1408'/>
+    <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-1402'/>
+    <qualified-type-def type-id='type-id-1409' const='yes' id='type-id-1439'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1411'/>
+    <qualified-type-def type-id='type-id-1463' id='type-id-1208'/>
+    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-1463'/>
+    <qualified-type-def type-id='type-id-1462' id='type-id-1207'/>
+    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1464' id='type-id-1209'/>
+    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1464'/>
     <qualified-type-def type-id='type-id-1100' id='type-id-2820'/>
     <qualified-type-def type-id='type-id-1107' id='type-id-2821'/>
     <qualified-type-def type-id='type-id-1558' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1558'/>
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1226'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1558'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1226'/>
     <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1569'/>
     <reference-type-def kind='lvalue' type-id='type-id-1567' size-in-bits='64' id='type-id-1571'/>
     <qualified-type-def type-id='type-id-1578' id='type-id-1576'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1514' size-in-bits='64' id='type-id-1578'/>
-    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1239'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1578'/>
+    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1239'/>
     <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1588'/>
     <reference-type-def kind='lvalue' type-id='type-id-1586' size-in-bits='64' id='type-id-1590'/>
     <pointer-type-def type-id='type-id-2777' size-in-bits='64' id='type-id-2822'/>
@@ -38643,10 +38643,10 @@
     <qualified-type-def type-id='type-id-2836' const='yes' id='type-id-2837'/>
     <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-1171'/>
     <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1443'/>
-    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1442'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-1405'/>
     <namespace-decl name='std'>
-      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1513'>
+      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1512'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-1013'/>
         <member-type access='private'>
           <class-decl name='sentry' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='398' column='1' id='type-id-1555'>
@@ -38714,7 +38714,7 @@
           <typedef-decl name='__streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='67' column='1' id='type-id-1566'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1567'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-1512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1567'/>
         </member-type>
         <member-function access='protected'>
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -39031,7 +39031,7 @@
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='100' column='1' id='type-id-502'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-459'/>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='90' column='1' id='type-id-582'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='90' column='1' id='type-id-533'/>
       <class-decl name='complex&lt;float&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1039' column='1' id='type-id-2801'>
         <member-type access='public'>
           <typedef-decl name='_ComplexT' type-id='type-id-2768' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/complex' line='1042' column='1' id='type-id-2807'/>
@@ -39143,7 +39143,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1514'>
+      <class-decl name='basic_ostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2176' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='56' column='1' id='type-id-1513'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-1017'/>
         <member-type access='private'>
           <typedef-decl name='__streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='67' column='1' id='type-id-1574'/>
@@ -39211,7 +39211,7 @@
           <typedef-decl name='__num_put_type' type-id='type-id-1235' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='71' column='1' id='type-id-1585'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-1514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1586'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='69' column='1' id='type-id-1586'/>
         </member-type>
         <member-function access='protected'>
           <function-decl name='basic_ostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -39523,146 +39523,146 @@
         </member-function>
       </class-decl>
       <class-decl name='ctype&lt;wchar_t&gt;' size-in-bits='10752' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1177' column='1' id='type-id-1233'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1382'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1381'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1182' column='1' id='type-id-1383'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1182' column='1' id='type-id-1382'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__wmask_type' type-id='type-id-964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1183' column='1' id='type-id-1384'/>
+          <typedef-decl name='__wmask_type' type-id='type-id-964' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1183' column='1' id='type-id-1383'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1186' column='1'/>
+          <var-decl name='_M_c_locale_ctype' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_narrow_ok' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1189' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='200'>
-          <var-decl name='_M_narrow' type-id='type-id-1385' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1190' column='1'/>
+          <var-decl name='_M_narrow' type-id='type-id-1384' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1190' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='1248'>
-          <var-decl name='_M_widen' type-id='type-id-1386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1191' column='1'/>
+          <var-decl name='_M_widen' type-id='type-id-1385' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1191' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='9440'>
-          <var-decl name='_M_bit' type-id='type-id-1387' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1194' column='1'/>
+          <var-decl name='_M_bit' type-id='type-id-1386' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1194' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='9728'>
-          <var-decl name='_M_wmask' type-id='type-id-1388' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1195' column='1'/>
+          <var-decl name='_M_wmask' type-id='type-id-1387' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1195' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt5ctypeIwE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='50' column='1' elf-symbol-id='_ZNSt5ctypeIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt5ctypeIwE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='50' column='1' elf-symbol-id='_ZNSt5ctypeIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2Em' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIwEC2EP15__locale_structm' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_convert_to_wmask' mangled-name='_ZNKSt5ctypeIwE19_M_convert_to_wmaskEt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE19_M_convert_to_wmaskEt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1390' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1391' name='__m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1'/>
-            <return type-id='type-id-1384'/>
+            <parameter type-id='type-id-1389' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1390' name='__m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='60' column='1'/>
+            <return type-id='type-id-1383'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_initialize_ctype' mangled-name='_ZNSt5ctypeIwE19_M_initialize_ctypeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwE19_M_initialize_ctypeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIwED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-1388' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
+            <parameter type-id='type-id-1382'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEtw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1395'/>
-            <return type-id='type-id-1394'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_is' mangled-name='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-395'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -39670,47 +39670,47 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1300' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1392'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-1393'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-395'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1334' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1396'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIwE10do_toupperEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -39718,29 +39718,29 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1350' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
-            <return type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1396'/>
-            <parameter type-id='type-id-1394'/>
-            <return type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1393'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIwE10do_tolowerEPwPKw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-368'/>
             <parameter type-id='type-id-395'/>
             <return type-id='type-id-395'/>
@@ -39748,30 +39748,30 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1387' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1383'/>
+            <return type-id='type-id-1382'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-409'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1396'/>
+            <parameter type-id='type-id-1395'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-368'/>
@@ -39780,15 +39780,15 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEwc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1383'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1382'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEwc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEwc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-409'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
@@ -39796,17 +39796,17 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='13'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
-            <parameter type-id='type-id-1394'/>
-            <parameter type-id='type-id-1394'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1393'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-98'/>
-            <return type-id='type-id-1394'/>
+            <return type-id='type-id-1393'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='13'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_members.cc' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-1391' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-16'/>
@@ -39817,7 +39817,7 @@
       </class-decl>
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cpp_type_traits.h' line='84' column='1' id='type-id-455'/>
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='96' column='1' id='type-id-459'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-582'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-533'/>
       </class-decl>
       <class-decl name='basic_stringbuf&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='60' column='1' id='type-id-2785'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1041'/>
@@ -40152,7 +40152,7 @@
         <enumerator name='_S_ios_fmtflags_end' value='65536'/>
       </enum-decl>
       <class-decl name='basic_ostringstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='2816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='373' column='1' id='type-id-2781'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1514'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1513'/>
         <member-type access='private'>
           <typedef-decl name='__stringbuf_type' type-id='type-id-2789' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='388' column='1' id='type-id-2862'/>
         </member-type>
@@ -40272,7 +40272,7 @@
         </member-function>
       </class-decl>
       <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='2816' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='373' column='1' id='type-id-2777'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1513'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1512'/>
         <member-type access='private'>
           <typedef-decl name='__stringbuf_type' type-id='type-id-2785' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='388' column='1' id='type-id-2868'/>
         </member-type>
@@ -40391,9 +40391,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__ctype_abstract_base&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='145' column='1' id='type-id-1382'>
+      <class-decl name='__ctype_abstract_base&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='145' column='1' id='type-id-1381'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1371'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='150' column='1' id='type-id-1550'/>
         </member-type>
@@ -40428,7 +40428,7 @@
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE5do_isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1550'/>
             <return type-id='type-id-10'/>
           </function-decl>
@@ -40438,14 +40438,14 @@
             <parameter type-id='type-id-1552' is-artificial='yes'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-1553'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE10do_scan_isEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
             <return type-id='type-id-1553'/>
@@ -40454,7 +40454,7 @@
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt21__ctype_abstract_baseIwE11do_scan_notEtPKwS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='430' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1552' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-1553'/>
             <parameter type-id='type-id-1553'/>
             <return type-id='type-id-1553'/>
@@ -40526,7 +40526,7 @@
         </member-function>
       </class-decl>
       <function-decl name='__check_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1392'/>
+        <parameter type-id='type-id-1391'/>
         <return type-id='type-id-2817'/>
       </function-decl>
       <function-decl name='operator|' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -40744,24 +40744,24 @@
     <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-2545'/>
     <qualified-type-def type-id='type-id-308' const='yes' id='type-id-2933'/>
     <qualified-type-def type-id='type-id-311' id='type-id-2934'/>
-    <qualified-type-def type-id='type-id-1474' const='yes' id='type-id-2935'/>
+    <qualified-type-def type-id='type-id-1473' const='yes' id='type-id-2935'/>
     <qualified-type-def type-id='type-id-2936' id='type-id-2937'/>
     <reference-type-def kind='lvalue' type-id='type-id-2935' size-in-bits='64' id='type-id-2936'/>
     <pointer-type-def type-id='type-id-2935' size-in-bits='64' id='type-id-2938'/>
-    <qualified-type-def type-id='type-id-1478' const='yes' id='type-id-2939'/>
+    <qualified-type-def type-id='type-id-1477' const='yes' id='type-id-2939'/>
     <qualified-type-def type-id='type-id-2940' id='type-id-2941'/>
     <reference-type-def kind='lvalue' type-id='type-id-2939' size-in-bits='64' id='type-id-2940'/>
     <pointer-type-def type-id='type-id-2939' size-in-bits='64' id='type-id-2942'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1474' size-in-bits='64' id='type-id-2943'/>
-    <pointer-type-def type-id='type-id-1474' size-in-bits='64' id='type-id-1612'/>
-    <qualified-type-def type-id='type-id-1612' const='yes' id='type-id-2944'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1613'/>
-    <pointer-type-def type-id='type-id-1609' size-in-bits='64' id='type-id-1611'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1478' size-in-bits='64' id='type-id-2945'/>
-    <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-1617'/>
-    <qualified-type-def type-id='type-id-1617' const='yes' id='type-id-2946'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1615' size-in-bits='64' id='type-id-1618'/>
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1616'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1473' size-in-bits='64' id='type-id-2943'/>
+    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-1613'/>
+    <qualified-type-def type-id='type-id-1613' const='yes' id='type-id-2944'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1611' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1477' size-in-bits='64' id='type-id-2945'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1618'/>
+    <qualified-type-def type-id='type-id-1618' const='yes' id='type-id-2946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1619'/>
+    <pointer-type-def type-id='type-id-1615' size-in-bits='64' id='type-id-1617'/>
     <qualified-type-def type-id='type-id-370' id='type-id-2947'/>
     <namespace-decl name='std'>
       <class-decl name='iterator_traits&lt;const char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='187' column='1' id='type-id-612'>
@@ -40792,61 +40792,61 @@
           <typedef-decl name='reference' type-id='type-id-526' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='193' column='1' id='type-id-515'/>
         </member-type>
       </class-decl>
-      <class-decl name='ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1478'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1608'/>
+      <class-decl name='ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1477'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1609'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1614'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1615'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-1514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1615'/>
+          <typedef-decl name='ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1616'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1616' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1617' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_failed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-1618'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1619'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-1616'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1617'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='iterator&lt;std::output_iterator_tag, void, void, void, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1608'/>
-      <class-decl name='ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1474'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1608'/>
+      <class-decl name='iterator&lt;std::output_iterator_tag, void, void, void, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='119' column='1' id='type-id-1609'/>
+      <class-decl name='ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='218' column='1' id='type-id-1473'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1609'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1609'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='227' column='1' id='type-id-1610'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-1513' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1610'/>
+          <typedef-decl name='ostream_type' type-id='type-id-1512' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='228' column='1' id='type-id-1611'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1611' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1612' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='238' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_failed' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='239' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1612' is-artificial='yes'/>
-            <parameter type-id='type-id-1613'/>
+            <parameter type-id='type-id-1613' is-artificial='yes'/>
+            <parameter type-id='type-id-1614'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ostreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1612' is-artificial='yes'/>
-            <parameter type-id='type-id-1611'/>
+            <parameter type-id='type-id-1613' is-artificial='yes'/>
+            <parameter type-id='type-id-1612'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -40855,12 +40855,12 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='_AssignableConcept&lt;std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='172' column='1' id='type-id-2899'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='__a' type-id='type-id-1474' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
+          <var-decl name='__a' type-id='type-id-1473' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='_AssignableConcept&lt;std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='172' column='1' id='type-id-2902'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='__a' type-id='type-id-1478' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
+          <var-decl name='__a' type-id='type-id-1477' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='181' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='_AssignableConcept&lt;char*&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/boost_concept_check.h' line='172' column='1' id='type-id-2890'>
@@ -41251,81 +41251,81 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1024' id='type-id-1385'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='1024' id='type-id-1384'>
       <subrange length='128' type-id='type-id-106' id='type-id-1518'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-1375'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='2048' id='type-id-1374'>
       <subrange length='256' type-id='type-id-106' id='type-id-1519'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='8192' id='type-id-1386'>
+    <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='8192' id='type-id-1385'>
       <subrange length='256' type-id='type-id-106' id='type-id-1519'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1024' id='type-id-1388'>
+    <array-type-def dimensions='1' type-id='type-id-53' size-in-bits='1024' id='type-id-1387'>
       <subrange length='16' type-id='type-id-106' id='type-id-1668'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-209' size-in-bits='256' id='type-id-1387'>
+    <array-type-def dimensions='1' type-id='type-id-209' size-in-bits='256' id='type-id-1386'>
       <subrange length='16' type-id='type-id-106' id='type-id-1668'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1630'/>
-    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-1379'/>
-    <qualified-type-def type-id='type-id-1379' const='yes' id='type-id-1378'/>
-    <qualified-type-def type-id='type-id-1372' const='yes' id='type-id-1631'/>
-    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1381'/>
-    <qualified-type-def type-id='type-id-1383' const='yes' id='type-id-1633'/>
-    <pointer-type-def type-id='type-id-1633' size-in-bits='64' id='type-id-1394'/>
-    <qualified-type-def type-id='type-id-1393' const='yes' id='type-id-1391'/>
-    <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-1374'/>
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1551'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-1380'/>
-    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1389'/>
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-1395'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1631'/>
+    <pointer-type-def type-id='type-id-1631' size-in-bits='64' id='type-id-1378'/>
+    <qualified-type-def type-id='type-id-1378' const='yes' id='type-id-1377'/>
+    <qualified-type-def type-id='type-id-1371' const='yes' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1380'/>
+    <qualified-type-def type-id='type-id-1382' const='yes' id='type-id-1634'/>
+    <pointer-type-def type-id='type-id-1634' size-in-bits='64' id='type-id-1393'/>
+    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1390'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-1373'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-1551'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1376'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-1379'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-1388'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1395'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1394'/>
     <pointer-type-def type-id='type-id-2950' size-in-bits='64' id='type-id-2951'/>
     <namespace-decl name='std'>
       <class-decl name='ctype&lt;char&gt;' size-in-bits='4608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='676' column='1' id='type-id-1177'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1371'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='681' column='1' id='type-id-1372'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='681' column='1' id='type-id-1371'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='685' column='1'/>
+          <var-decl name='_M_c_locale_ctype' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='685' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_del' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
-          <var-decl name='_M_toupper' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='687' column='1'/>
+          <var-decl name='_M_toupper' type-id='type-id-1372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='687' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='320'>
-          <var-decl name='_M_tolower' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='688' column='1'/>
+          <var-decl name='_M_tolower' type-id='type-id-1372' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='688' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='384'>
-          <var-decl name='_M_table' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='689' column='1'/>
+          <var-decl name='_M_table' type-id='type-id-1373' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='689' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='448'>
           <var-decl name='_M_widen_ok' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='690' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='456'>
-          <var-decl name='_M_widen' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='691' column='1'/>
+          <var-decl name='_M_widen' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='691' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='2504'>
-          <var-decl name='_M_narrow' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='692' column='1'/>
+          <var-decl name='_M_narrow' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='692' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='4552'>
           <var-decl name='_M_narrow_ok' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='693' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt5ctypeIcE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='47' column='1' elf-symbol-id='_ZNSt5ctypeIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt5ctypeIcE2idE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='47' column='1' elf-symbol-id='_ZNSt5ctypeIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='table_size' type-id='type-id-1376' mangled-name='_ZNSt5ctypeIcE10table_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='700' column='1' elf-symbol-id='_ZNSt5ctypeIcE10table_sizeE@@GLIBCXX_3.4'/>
+          <var-decl name='table_size' type-id='type-id-1375' mangled-name='_ZNSt5ctypeIcE10table_sizeE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='700' column='1' elf-symbol-id='_ZNSt5ctypeIcE10table_sizeE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='ctype' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -41333,9 +41333,9 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -41343,26 +41343,26 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_narrow_init' mangled-name='_ZNKSt5ctypeIcE14_M_narrow_initEv' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE14_M_narrow_initEv@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-1378' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1377' name='this' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_widen_init' mangled-name='_ZNKSt5ctypeIcE13_M_widen_initEv' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE13_M_widen_initEv@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-1378' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1377' name='this' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='classic_table' mangled-name='_ZNSt5ctypeIcE13classic_tableEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcE13classic_tableEv@@GLIBCXX_3.4'>
-            <return type-id='type-id-1374'/>
+            <return type-id='type-id-1373'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EP15__locale_structPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC2EP15__locale_structPKtbm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -41370,8 +41370,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='ctype' mangled-name='_ZNSt5ctypeIcEC2EPKtbm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcEC1EPKtbm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-1374'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
+            <parameter type-id='type-id-1373'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -41379,50 +41379,50 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED0Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ctype' mangled-name='_ZNSt5ctypeIcED2Ev' filepath='../../../.././libstdc++-v3/src/c++98/ctype.cc' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1376' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1007' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
-            <return type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1024' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1379'/>
             <parameter type-id='type-id-1380'/>
-            <parameter type-id='type-id-1381'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt5ctypeIcE10do_toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-98'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
@@ -41430,29 +41430,29 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1040' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
-            <return type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1057' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1379'/>
             <parameter type-id='type-id-1380'/>
-            <parameter type-id='type-id-1381'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt5ctypeIcE10do_tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/ctype_configure_char.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-98'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-4'/>
@@ -41460,36 +41460,36 @@
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIcE8do_widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE8do_widenEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1372'/>
+            <return type-id='type-id-1371'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_widen' mangled-name='_ZNKSt5ctypeIcE8do_widenEPKcS2_Pc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE8do_widenEPKcS2_Pc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-4'/>
-            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1379'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIcE9do_narrowEcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE9do_narrowEcc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1372'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1371'/>
             <parameter type-id='type-id-16'/>
             <return type-id='type-id-16'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt5ctypeIcE9do_narrowEPKcS2_cPc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt5ctypeIcE9do_narrowEPKcS2_cPc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1379' is-artificial='yes'/>
-            <parameter type-id='type-id-1381'/>
-            <parameter type-id='type-id-1381'/>
+            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1380'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-98'/>
-            <return type-id='type-id-1381'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -41533,45 +41533,45 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ctype_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='42' column='1' id='type-id-1371'>
+      <class-decl name='ctype_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='42' column='1' id='type-id-1370'>
         <member-type access='public'>
-          <typedef-decl name='mask' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='49' column='1' id='type-id-1393'/>
+          <typedef-decl name='mask' type-id='type-id-209' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='49' column='1' id='type-id-1392'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__to_type' type-id='type-id-1665' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='45' column='1' id='type-id-1373'/>
+          <typedef-decl name='__to_type' type-id='type-id-1593' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='45' column='1' id='type-id-1372'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='upper' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5upperE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='50' column='1' elf-symbol-id='_ZNSt10ctype_base5upperE@@GLIBCXX_3.4'/>
+          <var-decl name='upper' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5upperE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='50' column='1' elf-symbol-id='_ZNSt10ctype_base5upperE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='lower' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5lowerE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='51' column='1' elf-symbol-id='_ZNSt10ctype_base5lowerE@@GLIBCXX_3.4'/>
+          <var-decl name='lower' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5lowerE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='51' column='1' elf-symbol-id='_ZNSt10ctype_base5lowerE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='alpha' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5alphaE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='52' column='1' elf-symbol-id='_ZNSt10ctype_base5alphaE@@GLIBCXX_3.4'/>
+          <var-decl name='alpha' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5alphaE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='52' column='1' elf-symbol-id='_ZNSt10ctype_base5alphaE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='digit' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5digitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='53' column='1' elf-symbol-id='_ZNSt10ctype_base5digitE@@GLIBCXX_3.4'/>
+          <var-decl name='digit' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5digitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='53' column='1' elf-symbol-id='_ZNSt10ctype_base5digitE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='xdigit' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base6xdigitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='54' column='1' elf-symbol-id='_ZNSt10ctype_base6xdigitE@@GLIBCXX_3.4'/>
+          <var-decl name='xdigit' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base6xdigitE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='54' column='1' elf-symbol-id='_ZNSt10ctype_base6xdigitE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='space' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5spaceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='55' column='1' elf-symbol-id='_ZNSt10ctype_base5spaceE@@GLIBCXX_3.4'/>
+          <var-decl name='space' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5spaceE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='55' column='1' elf-symbol-id='_ZNSt10ctype_base5spaceE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='print' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5printE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='56' column='1' elf-symbol-id='_ZNSt10ctype_base5printE@@GLIBCXX_3.4'/>
+          <var-decl name='print' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5printE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='56' column='1' elf-symbol-id='_ZNSt10ctype_base5printE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='graph' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5graphE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='57' column='1' elf-symbol-id='_ZNSt10ctype_base5graphE@@GLIBCXX_3.4'/>
+          <var-decl name='graph' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5graphE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='57' column='1' elf-symbol-id='_ZNSt10ctype_base5graphE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='cntrl' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5cntrlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='58' column='1' elf-symbol-id='_ZNSt10ctype_base5cntrlE@@GLIBCXX_3.4'/>
+          <var-decl name='cntrl' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5cntrlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='58' column='1' elf-symbol-id='_ZNSt10ctype_base5cntrlE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='punct' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5punctE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='59' column='1' elf-symbol-id='_ZNSt10ctype_base5punctE@@GLIBCXX_3.4'/>
+          <var-decl name='punct' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5punctE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='59' column='1' elf-symbol-id='_ZNSt10ctype_base5punctE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='alnum' type-id='type-id-1391' mangled-name='_ZNSt10ctype_base5alnumE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='60' column='1' elf-symbol-id='_ZNSt10ctype_base5alnumE@@GLIBCXX_3.4'/>
+          <var-decl name='alnum' type-id='type-id-1390' mangled-name='_ZNSt10ctype_base5alnumE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/ctype_base.h' line='60' column='1' elf-symbol-id='_ZNSt10ctype_base5alnumE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -41693,7 +41693,7 @@
         <member-function access='private'>
           <function-decl name='stdio_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3021' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <parameter type-id='type-id-1151'/>
             <parameter type-id='type-id-3071'/>
             <return type-id='type-id-5'/>
@@ -41717,7 +41717,7 @@
         <member-function access='private'>
           <function-decl name='stdio_filebuf' mangled-name='_ZN9__gnu_cxx13stdio_filebufIwSt11char_traitsIwEEC2EP8_IO_FILESt13_Ios_Openmodem' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3021' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <parameter type-id='type-id-1151'/>
             <parameter type-id='type-id-3071'/>
             <return type-id='type-id-5'/>
@@ -41768,7 +41768,7 @@
         <member-function access='private'>
           <function-decl name='stdio_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3018' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <parameter type-id='type-id-1151'/>
             <parameter type-id='type-id-3072'/>
             <return type-id='type-id-5'/>
@@ -41792,7 +41792,7 @@
         <member-function access='private'>
           <function-decl name='stdio_filebuf' mangled-name='_ZN9__gnu_cxx13stdio_filebufIcSt11char_traitsIcEEC2EP8_IO_FILESt13_Ios_Openmodem' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_filebuf.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3018' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <parameter type-id='type-id-1151'/>
             <parameter type-id='type-id-3072'/>
             <return type-id='type-id-5'/>
@@ -42281,14 +42281,14 @@
         <member-function access='private'>
           <function-decl name='stdio_sync_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='stdio_sync_filebuf' mangled-name='_ZN9__gnu_cxx18stdio_sync_filebufIwSt11char_traitsIwEEC2EP8_IO_FILE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx18stdio_sync_filebufIwSt11char_traitsIwEEC2EP8_IO_FILE@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-3095' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -42383,7 +42383,7 @@
       <var-decl name='buf_wcin' type-id='type-id-3106' mangled-name='_ZN14__gnu_internal8buf_wcinE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='105' column='1'/>
       <var-decl name='buf_wcerr' type-id='type-id-3106' mangled-name='_ZN14__gnu_internal9buf_wcerrE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='106' column='1'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-3102'/>
+    <qualified-type-def type-id='type-id-1330' const='yes' id='type-id-3102'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/hash_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-3107' const='yes' id='type-id-3108'/>
@@ -42493,53 +42493,53 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1484' id='type-id-1230'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1484'/>
-    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1485'/>
-    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1227'/>
-    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1486'/>
-    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1229'/>
-    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1487'/>
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1228'/>
-    <qualified-type-def type-id='type-id-1488' id='type-id-1243'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1488'/>
-    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1489'/>
-    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1240'/>
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1490'/>
-    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1242'/>
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1491'/>
-    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1241'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1638' size-in-bits='64' id='type-id-3134'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1639'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1639' size-in-bits='64' id='type-id-3135'/>
-    <qualified-type-def type-id='type-id-1224' const='yes' id='type-id-1640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-3136'/>
-    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1641'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1641' size-in-bits='64' id='type-id-3137'/>
+    <qualified-type-def type-id='type-id-1483' id='type-id-1230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1483'/>
+    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1227'/>
+    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1485'/>
+    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1229'/>
+    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1487' id='type-id-1243'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1487'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-1240'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-1489' size-in-bits='64' id='type-id-1242'/>
+    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1241'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1639' size-in-bits='64' id='type-id-3134'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1640'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-3135'/>
+    <qualified-type-def type-id='type-id-1224' const='yes' id='type-id-1641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1641' size-in-bits='64' id='type-id-3136'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1642'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1642' size-in-bits='64' id='type-id-3137'/>
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1231'/>
     <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-1244'/>
     <namespace-decl name='std'>
       <function-decl name='__check_facet&lt;std::ctype&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1379'/>
+        <parameter type-id='type-id-1378'/>
         <return type-id='type-id-3138'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-3138'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1631' size-in-bits='64' id='type-id-3138'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-1156' size-in-bits='1024' id='type-id-1169'>
-      <subrange length='8' type-id='type-id-106' id='type-id-1329'/>
+      <subrange length='8' type-id='type-id-106' id='type-id-1515'/>
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-1457'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1455'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1497' size-in-bits='64' id='type-id-1172'/>
+    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-1456'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1454'/>
     <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
     <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-3139'/>
     <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1174'/>
     <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
     <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-1146'/>
-    <reference-type-def kind='lvalue' type-id='type-id-18' size-in-bits='64' id='type-id-1466'/>
+    <reference-type-def kind='lvalue' type-id='type-id-18' size-in-bits='64' id='type-id-1465'/>
     <namespace-decl name='std'>
       <class-decl name='numeric_limits&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='982' column='1' id='type-id-3140'>
         <data-member access='public' static='yes'>
@@ -42615,14 +42615,14 @@
     </namespace-decl>
     <function-type size-in-bits='64' id='type-id-1517'>
       <parameter type-id='type-id-1144'/>
-      <parameter type-id='type-id-1455'/>
+      <parameter type-id='type-id-1454'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_failure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1499'/>
-    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1150'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1498'/>
+    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1150'/>
     <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-1149'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
@@ -42630,14 +42630,14 @@
     <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-3143'/>
     <reference-type-def kind='lvalue' type-id='type-id-3143' size-in-bits='64' id='type-id-3144'/>
     <reference-type-def kind='lvalue' type-id='type-id-1163' size-in-bits='64' id='type-id-3145'/>
-    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1331'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1330'/>
     <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
     <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1266'/>
     <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-1568'/>
     <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-1587'/>
     <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_file' type-id='type-id-204' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-1642'/>
+      <typedef-decl name='__c_file' type-id='type-id-204' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-1643'/>
       <function-decl name='operator|' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1163'/>
         <parameter type-id='type-id-1163'/>
@@ -42669,14 +42669,14 @@
         <member-function access='private'>
           <function-decl name='stdio_sync_filebuf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3142' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='stdio_sync_filebuf' mangled-name='_ZN9__gnu_cxx18stdio_sync_filebufIcSt11char_traitsIcEEC2EP8_IO_FILE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/stdio_sync_filebuf.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx18stdio_sync_filebufIcSt11char_traitsIcEEC2EP8_IO_FILE@@GLIBCXX_3.4.10'>
             <parameter type-id='type-id-3142' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1330'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -42763,7 +42763,7 @@
     <namespace-decl name='std'>
       <class-decl name='basic_iostream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2046'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1106'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1514'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1513'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2051' is-artificial='yes'/>
@@ -42862,80 +42862,80 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-378' id='type-id-3150'/>
-    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1622'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1492'/>
-    <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1195'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1623'/>
+    <pointer-type-def type-id='type-id-1623' size-in-bits='64' id='type-id-1491'/>
+    <qualified-type-def type-id='type-id-1491' const='yes' id='type-id-1195'/>
     <qualified-type-def type-id='type-id-1187' const='yes' id='type-id-3151'/>
     <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-3152'/>
     <qualified-type-def type-id='type-id-1180' const='yes' id='type-id-3153'/>
     <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-3154'/>
-    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1623'/>
-    <pointer-type-def type-id='type-id-1623' size-in-bits='64' id='type-id-1493'/>
-    <qualified-type-def type-id='type-id-1493' const='yes' id='type-id-1270'/>
+    <qualified-type-def type-id='type-id-1106' const='yes' id='type-id-1624'/>
+    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-1492'/>
+    <qualified-type-def type-id='type-id-1492' const='yes' id='type-id-1270'/>
     <qualified-type-def type-id='type-id-1264' const='yes' id='type-id-3155'/>
     <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-3156'/>
     <qualified-type-def type-id='type-id-1257' const='yes' id='type-id-3157'/>
     <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-3158'/>
-    <qualified-type-def type-id='type-id-1447' const='yes' id='type-id-3159'/>
+    <qualified-type-def type-id='type-id-1446' const='yes' id='type-id-3159'/>
     <reference-type-def kind='lvalue' type-id='type-id-3159' size-in-bits='64' id='type-id-3160'/>
     <pointer-type-def type-id='type-id-3159' size-in-bits='64' id='type-id-3161'/>
     <qualified-type-def type-id='type-id-3161' const='yes' id='type-id-3162'/>
-    <qualified-type-def type-id='type-id-1468' const='yes' id='type-id-3163'/>
+    <qualified-type-def type-id='type-id-1467' const='yes' id='type-id-3163'/>
     <reference-type-def kind='lvalue' type-id='type-id-3163' size-in-bits='64' id='type-id-3164'/>
     <pointer-type-def type-id='type-id-3163' size-in-bits='64' id='type-id-3165'/>
     <qualified-type-def type-id='type-id-3165' const='yes' id='type-id-3166'/>
-    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1449'/>
-    <qualified-type-def type-id='type-id-1449' const='yes' id='type-id-1451'/>
-    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1470'/>
-    <qualified-type-def type-id='type-id-1470' const='yes' id='type-id-1471'/>
-    <qualified-type-def type-id='type-id-1658' const='yes' id='type-id-1827'/>
-    <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1759'/>
+    <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1448'/>
+    <qualified-type-def type-id='type-id-1448' const='yes' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1469'/>
+    <qualified-type-def type-id='type-id-1469' const='yes' id='type-id-1470'/>
+    <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1857'/>
+    <pointer-type-def type-id='type-id-1857' size-in-bits='64' id='type-id-1759'/>
     <qualified-type-def type-id='type-id-1759' const='yes' id='type-id-3167'/>
-    <qualified-type-def type-id='type-id-1659' const='yes' id='type-id-1828'/>
-    <pointer-type-def type-id='type-id-1828' size-in-bits='64' id='type-id-1766'/>
+    <qualified-type-def type-id='type-id-1660' const='yes' id='type-id-1858'/>
+    <pointer-type-def type-id='type-id-1858' size-in-bits='64' id='type-id-1766'/>
     <qualified-type-def type-id='type-id-1766' const='yes' id='type-id-3168'/>
-    <qualified-type-def type-id='type-id-1457' id='type-id-1202'/>
-    <qualified-type-def type-id='type-id-1461' id='type-id-1205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-1461'/>
-    <qualified-type-def type-id='type-id-1462' id='type-id-1206'/>
-    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-1462'/>
-    <qualified-type-def type-id='type-id-1502' id='type-id-1199'/>
-    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1502'/>
+    <qualified-type-def type-id='type-id-1456' id='type-id-1202'/>
+    <qualified-type-def type-id='type-id-1460' id='type-id-1205'/>
+    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-1460'/>
+    <qualified-type-def type-id='type-id-1461' id='type-id-1206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-1461'/>
+    <qualified-type-def type-id='type-id-1501' id='type-id-1199'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1501'/>
     <qualified-type-def type-id='type-id-3169' id='type-id-3170'/>
     <reference-type-def kind='lvalue' type-id='type-id-210' size-in-bits='64' id='type-id-3169'/>
     <pointer-type-def type-id='type-id-1550' size-in-bits='64' id='type-id-1554'/>
     <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-3171'/>
-    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1193'/>
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-1192'/>
-    <qualified-type-def type-id='type-id-1507' id='type-id-1196'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1507'/>
-    <qualified-type-def type-id='type-id-1508' id='type-id-1197'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1193'/>
+    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1192'/>
+    <qualified-type-def type-id='type-id-1506' id='type-id-1196'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1506'/>
+    <qualified-type-def type-id='type-id-1507' id='type-id-1197'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1507'/>
     <reference-type-def kind='lvalue' type-id='type-id-1263' size-in-bits='64' id='type-id-3172'/>
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1269'/>
-    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1268'/>
-    <qualified-type-def type-id='type-id-1511' id='type-id-1271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1511'/>
-    <qualified-type-def type-id='type-id-1512' id='type-id-1272'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1260' size-in-bits='64' id='type-id-1512'/>
-    <qualified-type-def type-id='type-id-1455' id='type-id-1452'/>
-    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1194'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1447' size-in-bits='64' id='type-id-3173'/>
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1599'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1597' size-in-bits='64' id='type-id-1600'/>
-    <pointer-type-def type-id='type-id-1594' size-in-bits='64' id='type-id-1598'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1468' size-in-bits='64' id='type-id-3174'/>
-    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-1606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-1605'/>
+    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-1269'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1268'/>
+    <qualified-type-def type-id='type-id-1510' id='type-id-1271'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1510'/>
+    <qualified-type-def type-id='type-id-1511' id='type-id-1272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1260' size-in-bits='64' id='type-id-1511'/>
+    <qualified-type-def type-id='type-id-1454' id='type-id-1451'/>
+    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1194'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1446' size-in-bits='64' id='type-id-3173'/>
+    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1600'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1601'/>
+    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-1599'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1467' size-in-bits='64' id='type-id-3174'/>
+    <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-1607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1605' size-in-bits='64' id='type-id-1608'/>
+    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-1606'/>
     <qualified-type-def type-id='type-id-3175' id='type-id-3176'/>
     <reference-type-def kind='lvalue' type-id='type-id-88' size-in-bits='64' id='type-id-3175'/>
-    <qualified-type-def type-id='type-id-1459' id='type-id-1201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-12' size-in-bits='64' id='type-id-1459'/>
-    <qualified-type-def type-id='type-id-1460' id='type-id-1203'/>
-    <qualified-type-def type-id='type-id-1458' id='type-id-1200'/>
-    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-1458'/>
-    <qualified-type-def type-id='type-id-1466' id='type-id-1210'/>
+    <qualified-type-def type-id='type-id-1458' id='type-id-1201'/>
+    <reference-type-def kind='lvalue' type-id='type-id-12' size-in-bits='64' id='type-id-1458'/>
+    <qualified-type-def type-id='type-id-1459' id='type-id-1203'/>
+    <qualified-type-def type-id='type-id-1457' id='type-id-1200'/>
+    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-1457'/>
+    <qualified-type-def type-id='type-id-1465' id='type-id-1210'/>
     <qualified-type-def type-id='type-id-384' id='type-id-3177'/>
     <namespace-decl name='std'>
       <typedef-decl name='wstreampos' type-id='type-id-1516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='232' column='1' id='type-id-1278'/>
@@ -42964,84 +42964,84 @@
           <var-decl name='_M_n' type-id='type-id-6' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='214' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1447'>
+      <class-decl name='istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1446'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1318'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1594'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1041' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1595'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='int_type' type-id='type-id-1054' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1595'/>
+          <typedef-decl name='int_type' type-id='type-id-1054' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1596'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1596'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1597'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='istream_type' type-id='type-id-1099' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1597'/>
+          <typedef-decl name='istream_type' type-id='type-id-1099' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1598'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1598' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1599' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_c' type-id='type-id-1595' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
+          <var-decl name='_M_c' type-id='type-id-1596' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1600'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-1601'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1598'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-1599'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1468'>
+      <class-decl name='istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='52' column='1' id='type-id-1467'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1321'/>
         <member-type access='private'>
-          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1601'/>
+          <typedef-decl name='streambuf_type' type-id='type-id-1045' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='69' column='1' id='type-id-1602'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='int_type' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1602'/>
+          <typedef-decl name='int_type' type-id='type-id-1063' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='68' column='1' id='type-id-1603'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1603'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='66' column='1' id='type-id-1604'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='istream_type' type-id='type-id-1106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1604'/>
+          <typedef-decl name='istream_type' type-id='type-id-1106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='70' column='1' id='type-id-1605'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sbuf' type-id='type-id-1605' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
+          <var-decl name='_M_sbuf' type-id='type-id-1606' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='99' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_c' type-id='type-id-1602' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
+          <var-decl name='_M_c' type-id='type-id-1603' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='100' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
+            <parameter type-id='type-id-1608'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='istreambuf_iterator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/streambuf_iterator.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1606' is-artificial='yes'/>
-            <parameter type-id='type-id-1605'/>
+            <parameter type-id='type-id-1607' is-artificial='yes'/>
+            <parameter type-id='type-id-1606'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -43056,7 +43056,7 @@
         <return type-id='type-id-3144'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::num_get&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1449'/>
+        <parameter type-id='type-id-1448'/>
         <return type-id='type-id-3134'/>
       </function-decl>
       <function-decl name='operator~' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -43064,7 +43064,7 @@
         <return type-id='type-id-986'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1470'/>
+        <parameter type-id='type-id-1469'/>
         <return type-id='type-id-3135'/>
       </function-decl>
       <function-decl name='operator==&lt;__mbstate_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -43189,29 +43189,29 @@
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__enable_if&lt;true, int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='47' column='1' id='type-id-1666'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-1450'/>
+          <typedef-decl name='__type' type-id='type-id-6' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/type_traits.h' line='48' column='1' id='type-id-1449'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-1505'>
+    <function-type size-in-bits='64' id='type-id-1504'>
       <parameter type-id='type-id-3171'/>
       <return type-id='type-id-3171'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1506'>
+    <function-type size-in-bits='64' id='type-id-1505'>
       <parameter type-id='type-id-1104'/>
       <return type-id='type-id-1104'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1509'>
+    <function-type size-in-bits='64' id='type-id-1508'>
       <parameter type-id='type-id-3172'/>
       <return type-id='type-id-3172'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1510'>
+    <function-type size-in-bits='64' id='type-id-1509'>
       <parameter type-id='type-id-1111'/>
       <return type-id='type-id-1111'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1515'>
-      <parameter type-id='type-id-1455'/>
-      <return type-id='type-id-1455'/>
+    <function-type size-in-bits='64' id='type-id-1514'>
+      <parameter type-id='type-id-1454'/>
+      <return type-id='type-id-1454'/>
     </function-type>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-3184'/>
     <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-3183'/>
@@ -43219,8 +43219,8 @@
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-3185'/>
     <qualified-type-def type-id='type-id-1260' const='yes' id='type-id-3186'/>
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-471'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-3138'/>
+    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-471'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1631' size-in-bits='64' id='type-id-3138'/>
     <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1191'/>
     <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1267'/>
     <qualified-type-def type-id='type-id-454' id='type-id-457'/>
@@ -43309,16 +43309,16 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='88' id='type-id-1833'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='88' id='type-id-1804'>
       <subrange length='11' type-id='type-id-106' id='type-id-1863'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='208' id='type-id-1848'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='208' id='type-id-1819'>
       <subrange length='26' type-id='type-id-106' id='type-id-1864'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='288' id='type-id-1847'>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='288' id='type-id-1818'>
       <subrange length='36' type-id='type-id-106' id='type-id-1865'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1786'/>
+    <qualified-type-def type-id='type-id-1335' const='yes' id='type-id-1786'/>
     <pointer-type-def type-id='type-id-1786' size-in-bits='64' id='type-id-1526'/>
     <qualified-type-def type-id='type-id-1523' const='yes' id='type-id-1787'/>
     <pointer-type-def type-id='type-id-1787' size-in-bits='64' id='type-id-1532'/>
@@ -43330,18 +43330,18 @@
     <pointer-type-def type-id='type-id-3194' size-in-bits='64' id='type-id-3195'/>
     <qualified-type-def type-id='type-id-3196' const='yes' id='type-id-3197'/>
     <pointer-type-def type-id='type-id-3197' size-in-bits='64' id='type-id-3198'/>
-    <qualified-type-def type-id='type-id-1727' const='yes' id='type-id-1867'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1867' size-in-bits='64' id='type-id-1835'/>
-    <pointer-type-def type-id='type-id-1867' size-in-bits='64' id='type-id-3199'/>
-    <qualified-type-def type-id='type-id-1735' const='yes' id='type-id-1868'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1868' size-in-bits='64' id='type-id-1838'/>
-    <pointer-type-def type-id='type-id-1868' size-in-bits='64' id='type-id-3200'/>
-    <qualified-type-def type-id='type-id-1754' const='yes' id='type-id-1871'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1871' size-in-bits='64' id='type-id-1850'/>
-    <pointer-type-def type-id='type-id-1871' size-in-bits='64' id='type-id-3201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1873' size-in-bits='64' id='type-id-3202'/>
-    <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1875'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1875' size-in-bits='64' id='type-id-1859'/>
+    <qualified-type-def type-id='type-id-1727' const='yes' id='type-id-1870'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1870' size-in-bits='64' id='type-id-1806'/>
+    <pointer-type-def type-id='type-id-1870' size-in-bits='64' id='type-id-3199'/>
+    <qualified-type-def type-id='type-id-1735' const='yes' id='type-id-1871'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1871' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-1871' size-in-bits='64' id='type-id-3200'/>
+    <qualified-type-def type-id='type-id-1754' const='yes' id='type-id-1874'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1874' size-in-bits='64' id='type-id-1821'/>
+    <pointer-type-def type-id='type-id-1874' size-in-bits='64' id='type-id-3201'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1876' size-in-bits='64' id='type-id-3202'/>
+    <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1878'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1878' size-in-bits='64' id='type-id-1830'/>
     <qualified-type-def type-id='type-id-3203' const='yes' id='type-id-3204'/>
     <pointer-type-def type-id='type-id-3204' size-in-bits='64' id='type-id-3205'/>
     <qualified-type-def type-id='type-id-3205' const='yes' id='type-id-3206'/>
@@ -43351,49 +43351,49 @@
     <qualified-type-def type-id='type-id-3211' const='yes' id='type-id-3212'/>
     <pointer-type-def type-id='type-id-3212' size-in-bits='64' id='type-id-3213'/>
     <qualified-type-def type-id='type-id-3213' const='yes' id='type-id-3214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-2047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1811' size-in-bits='64' id='type-id-3215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-2047'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1841' size-in-bits='64' id='type-id-3215'/>
     <qualified-type-def type-id='type-id-1679' const='yes' id='type-id-3216'/>
     <qualified-type-def type-id='type-id-3160' id='type-id-3217'/>
-    <qualified-type-def type-id='type-id-1595' const='yes' id='type-id-3218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1813' size-in-bits='64' id='type-id-3219'/>
+    <qualified-type-def type-id='type-id-1596' const='yes' id='type-id-3218'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1843' size-in-bits='64' id='type-id-3219'/>
     <qualified-type-def type-id='type-id-1687' const='yes' id='type-id-1689'/>
-    <qualified-type-def type-id='type-id-1686' const='yes' id='type-id-1877'/>
-    <qualified-type-def type-id='type-id-1814' id='type-id-1690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1877' size-in-bits='64' id='type-id-1814'/>
-    <qualified-type-def type-id='type-id-1650' const='yes' id='type-id-1817'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1817' size-in-bits='64' id='type-id-3220'/>
-    <pointer-type-def type-id='type-id-1817' size-in-bits='64' id='type-id-1700'/>
+    <qualified-type-def type-id='type-id-1686' const='yes' id='type-id-1880'/>
+    <qualified-type-def type-id='type-id-1844' id='type-id-1690'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1880' size-in-bits='64' id='type-id-1844'/>
+    <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1847'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1847' size-in-bits='64' id='type-id-3220'/>
+    <pointer-type-def type-id='type-id-1847' size-in-bits='64' id='type-id-1700'/>
     <qualified-type-def type-id='type-id-1700' const='yes' id='type-id-1698'/>
     <qualified-type-def type-id='type-id-1695' const='yes' id='type-id-3221'/>
-    <qualified-type-def type-id='type-id-1652' const='yes' id='type-id-1819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1819' size-in-bits='64' id='type-id-3222'/>
-    <pointer-type-def type-id='type-id-1819' size-in-bits='64' id='type-id-1714'/>
+    <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-1849'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1849' size-in-bits='64' id='type-id-3222'/>
+    <pointer-type-def type-id='type-id-1849' size-in-bits='64' id='type-id-1714'/>
     <qualified-type-def type-id='type-id-1714' const='yes' id='type-id-1712'/>
     <qualified-type-def type-id='type-id-1709' const='yes' id='type-id-3223'/>
-    <qualified-type-def type-id='type-id-1711' const='yes' id='type-id-1820'/>
+    <qualified-type-def type-id='type-id-1711' const='yes' id='type-id-1850'/>
     <qualified-type-def type-id='type-id-1715' id='type-id-1713'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1820' size-in-bits='64' id='type-id-1715'/>
-    <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1823'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1823' size-in-bits='64' id='type-id-3224'/>
-    <pointer-type-def type-id='type-id-1823' size-in-bits='64' id='type-id-1730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1850' size-in-bits='64' id='type-id-1715'/>
+    <qualified-type-def type-id='type-id-1655' const='yes' id='type-id-1853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1853' size-in-bits='64' id='type-id-3224'/>
+    <pointer-type-def type-id='type-id-1853' size-in-bits='64' id='type-id-1730'/>
     <qualified-type-def type-id='type-id-1730' const='yes' id='type-id-3225'/>
-    <qualified-type-def type-id='type-id-1655' const='yes' id='type-id-1824'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1824' size-in-bits='64' id='type-id-3226'/>
-    <pointer-type-def type-id='type-id-1824' size-in-bits='64' id='type-id-1738'/>
+    <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1854'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1854' size-in-bits='64' id='type-id-3226'/>
+    <pointer-type-def type-id='type-id-1854' size-in-bits='64' id='type-id-1738'/>
     <qualified-type-def type-id='type-id-1738' const='yes' id='type-id-3227'/>
-    <qualified-type-def type-id='type-id-1448' const='yes' id='type-id-3228'/>
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1476'/>
-    <qualified-type-def type-id='type-id-1476' const='yes' id='type-id-1475'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1827' size-in-bits='64' id='type-id-3229'/>
-    <qualified-type-def type-id='type-id-1661' const='yes' id='type-id-1829'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1829' size-in-bits='64' id='type-id-3230'/>
-    <pointer-type-def type-id='type-id-1829' size-in-bits='64' id='type-id-1770'/>
+    <qualified-type-def type-id='type-id-1447' const='yes' id='type-id-3228'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-1475' const='yes' id='type-id-1474'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1857' size-in-bits='64' id='type-id-3229'/>
+    <qualified-type-def type-id='type-id-1662' const='yes' id='type-id-1859'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1859' size-in-bits='64' id='type-id-3230'/>
+    <pointer-type-def type-id='type-id-1859' size-in-bits='64' id='type-id-1770'/>
     <qualified-type-def type-id='type-id-1770' const='yes' id='type-id-1772'/>
     <qualified-type-def type-id='type-id-1768' const='yes' id='type-id-3231'/>
-    <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1831'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1831' size-in-bits='64' id='type-id-3232'/>
-    <pointer-type-def type-id='type-id-1831' size-in-bits='64' id='type-id-1780'/>
+    <qualified-type-def type-id='type-id-1664' const='yes' id='type-id-1861'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1861' size-in-bits='64' id='type-id-3232'/>
+    <pointer-type-def type-id='type-id-1861' size-in-bits='64' id='type-id-1780'/>
     <qualified-type-def type-id='type-id-1780' const='yes' id='type-id-1779'/>
     <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1530'/>
     <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
@@ -43403,30 +43403,30 @@
     <pointer-type-def type-id='type-id-3193' size-in-bits='64' id='type-id-3233'/>
     <pointer-type-def type-id='type-id-3196' size-in-bits='64' id='type-id-3234'/>
     <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-3235'/>
-    <qualified-type-def type-id='type-id-1834' const='yes' id='type-id-1836'/>
+    <qualified-type-def type-id='type-id-1805' const='yes' id='type-id-1807'/>
     <reference-type-def kind='lvalue' type-id='type-id-1735' size-in-bits='64' id='type-id-3236'/>
-    <qualified-type-def type-id='type-id-1837' const='yes' id='type-id-1839'/>
+    <qualified-type-def type-id='type-id-1808' const='yes' id='type-id-1810'/>
     <reference-type-def kind='lvalue' type-id='type-id-1754' size-in-bits='64' id='type-id-3237'/>
-    <qualified-type-def type-id='type-id-1849' const='yes' id='type-id-1851'/>
+    <qualified-type-def type-id='type-id-1820' const='yes' id='type-id-1822'/>
     <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-1671'/>
     <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-3238'/>
     <pointer-type-def type-id='type-id-3239' size-in-bits='64' id='type-id-3240'/>
     <pointer-type-def type-id='type-id-3241' size-in-bits='64' id='type-id-3242'/>
-    <qualified-type-def type-id='type-id-1599' const='yes' id='type-id-3243'/>
+    <qualified-type-def type-id='type-id-1600' const='yes' id='type-id-3243'/>
     <pointer-type-def type-id='type-id-3244' size-in-bits='64' id='type-id-3245'/>
     <qualified-type-def type-id='type-id-1701' id='type-id-1699'/>
     <reference-type-def kind='lvalue' type-id='type-id-1697' size-in-bits='64' id='type-id-1701'/>
     <pointer-type-def type-id='type-id-3246' size-in-bits='64' id='type-id-3247'/>
     <pointer-type-def type-id='type-id-3248' size-in-bits='64' id='type-id-3249'/>
     <pointer-type-def type-id='type-id-3250' size-in-bits='64' id='type-id-3251'/>
-    <qualified-type-def type-id='type-id-1660' id='type-id-1454'/>
-    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-1660'/>
+    <qualified-type-def type-id='type-id-1661' id='type-id-1453'/>
+    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-1661'/>
     <pointer-type-def type-id='type-id-3252' size-in-bits='64' id='type-id-3253'/>
     <pointer-type-def type-id='type-id-3254' size-in-bits='64' id='type-id-3255'/>
     <namespace-decl name='std'>
       <class-decl name='__ctype_abstract_base&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='145' column='1' id='type-id-3193'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1371'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='150' column='1' id='type-id-3196'/>
         </member-type>
@@ -43461,7 +43461,7 @@
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE5do_isEtc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3195' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-3196'/>
             <return type-id='type-id-10'/>
           </function-decl>
@@ -43471,14 +43471,14 @@
             <parameter type-id='type-id-3195' is-artificial='yes'/>
             <parameter type-id='type-id-3198'/>
             <parameter type-id='type-id-3198'/>
-            <parameter type-id='type-id-1395'/>
+            <parameter type-id='type-id-1394'/>
             <return type-id='type-id-3198'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_scan_is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE10do_scan_isEtPKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3195' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-3198'/>
             <parameter type-id='type-id-3198'/>
             <return type-id='type-id-3198'/>
@@ -43487,7 +43487,7 @@
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_scan_not' mangled-name='_ZNKSt21__ctype_abstract_baseIcE11do_scan_notEtPKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='430' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3195' is-artificial='yes'/>
-            <parameter type-id='type-id-1393'/>
+            <parameter type-id='type-id-1392'/>
             <parameter type-id='type-id-3198'/>
             <parameter type-id='type-id-3198'/>
             <return type-id='type-id-3198'/>
@@ -43559,7 +43559,7 @@
         </member-function>
       </class-decl>
       <class-decl name='collate_byname&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='760' column='1' id='type-id-3241'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1646'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1647'/>
         <member-function access='private'>
           <function-decl name='collate_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3242' is-artificial='yes'/>
@@ -43639,7 +43639,7 @@
         </member-function>
       </class-decl>
       <class-decl name='messages_byname&lt;char&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1879' column='1' id='type-id-3244'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1648'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1649'/>
         <member-function access='private'>
           <function-decl name='messages_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3245' is-artificial='yes'/>
@@ -43679,7 +43679,7 @@
         </member-function>
       </class-decl>
       <class-decl name='numpunct_byname&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1876' column='1' id='type-id-3250'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1658'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1659'/>
         <member-function access='private'>
           <function-decl name='numpunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3251' is-artificial='yes'/>
@@ -43719,7 +43719,7 @@
         </member-function>
       </class-decl>
       <class-decl name='moneypunct_byname&lt;char, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1324' column='1' id='type-id-3248'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1655'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1656'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-272' mangled-name='_ZNSt17moneypunct_bynameIcLb1EE4intlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1330' column='1' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb1EE4intlE@@GLIBCXX_3.4'/>
         </data-member>
@@ -43762,7 +43762,7 @@
         </member-function>
       </class-decl>
       <class-decl name='moneypunct_byname&lt;char, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1324' column='1' id='type-id-3246'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1654'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1655'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-272' mangled-name='_ZNSt17moneypunct_bynameIcLb0EE4intlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1330' column='1' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb0EE4intlE@@GLIBCXX_3.4'/>
         </data-member>
@@ -43805,7 +43805,7 @@
         </member-function>
       </class-decl>
       <class-decl name='time_put_byname&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='811' column='1' id='type-id-3254'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1663'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1664'/>
         <member-function access='private'>
           <function-decl name='time_put_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3255' is-artificial='yes'/>
@@ -43845,7 +43845,7 @@
         </member-function>
       </class-decl>
       <class-decl name='time_get_byname&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='686' column='1' id='type-id-3252'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1661'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1662'/>
         <member-function access='private'>
           <function-decl name='time_get_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3253' is-artificial='yes'/>
@@ -43909,10 +43909,10 @@
         <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='__write&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1474'/>
+        <parameter type-id='type-id-1473'/>
         <parameter type-id='type-id-4'/>
         <parameter type-id='type-id-6'/>
-        <return type-id='type-id-1474'/>
+        <return type-id='type-id-1473'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::ctype&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt5ctypeIcEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt5ctypeIcEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1'/>
@@ -44045,18 +44045,18 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='16' id='type-id-3257'>
-      <subrange length='2' type-id='type-id-106' id='type-id-1620'/>
+      <subrange length='2' type-id='type-id-106' id='type-id-1621'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='16' id='type-id-1398'>
-      <subrange length='2' type-id='type-id-106' id='type-id-1620'/>
+    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='16' id='type-id-1397'>
+      <subrange length='2' type-id='type-id-106' id='type-id-1621'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-572' const='yes' id='type-id-430'/>
-    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1444'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1636' size-in-bits='64' id='type-id-1400'/>
-    <qualified-type-def type-id='type-id-1409' const='yes' id='type-id-3258'/>
-    <qualified-type-def type-id='type-id-1443' const='yes' id='type-id-1445'/>
-    <qualified-type-def type-id='type-id-1406' const='yes' id='type-id-1408'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1370' size-in-bits='64' id='type-id-3259'/>
+    <qualified-type-def type-id='type-id-578' const='yes' id='type-id-430'/>
+    <qualified-type-def type-id='type-id-1635' const='yes' id='type-id-1443'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1399'/>
+    <qualified-type-def type-id='type-id-1408' const='yes' id='type-id-3258'/>
+    <qualified-type-def type-id='type-id-1442' const='yes' id='type-id-1444'/>
+    <qualified-type-def type-id='type-id-1405' const='yes' id='type-id-1407'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1369' size-in-bits='64' id='type-id-3259'/>
     <namespace-decl name='std'>
       <function-decl name='operator==&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2490' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-452'/>
@@ -44081,11 +44081,11 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-1857'>
-      <subrange length='14' type-id='type-id-106' id='type-id-1866'/>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='896' id='type-id-1828'>
+      <subrange length='14' type-id='type-id-106' id='type-id-1869'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-395' size-in-bits='896' id='type-id-1860'>
-      <subrange length='14' type-id='type-id-106' id='type-id-1866'/>
+    <array-type-def dimensions='1' type-id='type-id-395' size-in-bits='896' id='type-id-1831'>
+      <subrange length='14' type-id='type-id-106' id='type-id-1869'/>
     </array-type-def>
     <qualified-type-def type-id='type-id-1172' id='type-id-3262'/>
     <namespace-decl name='std'>
@@ -44119,68 +44119,68 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1731' const='yes' id='type-id-1806'/>
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1834'/>
-    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1837'/>
-    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1841'/>
-    <pointer-type-def type-id='type-id-1749' size-in-bits='64' id='type-id-1844'/>
-    <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1849'/>
-    <pointer-type-def type-id='type-id-1761' size-in-bits='64' id='type-id-1854'/>
-    <pointer-type-def type-id='type-id-1644' size-in-bits='64' id='type-id-1421'/>
-    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1433'/>
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1858'/>
-    <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1861'/>
-    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1416'/>
-    <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1428'/>
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1431'/>
-    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-1420'/>
-    <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1432'/>
-    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1417'/>
+    <qualified-type-def type-id='type-id-1731' const='yes' id='type-id-1836'/>
+    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-1805'/>
+    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1808'/>
+    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1812'/>
+    <pointer-type-def type-id='type-id-1749' size-in-bits='64' id='type-id-1815'/>
+    <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1820'/>
+    <pointer-type-def type-id='type-id-1761' size-in-bits='64' id='type-id-1825'/>
+    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1420'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1432'/>
+    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1829'/>
+    <pointer-type-def type-id='type-id-1675' size-in-bits='64' id='type-id-1832'/>
+    <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1415'/>
+    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1423'/>
+    <pointer-type-def type-id='type-id-1650' size-in-bits='64' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1418'/>
+    <pointer-type-def type-id='type-id-1652' size-in-bits='64' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-1653' size-in-bits='64' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-1655' size-in-bits='64' id='type-id-1416'/>
     <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-1728'/>
-    <pointer-type-def type-id='type-id-1655' size-in-bits='64' id='type-id-1418'/>
+    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1417'/>
     <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1736'/>
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1429'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1428'/>
     <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1743'/>
-    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-1658' size-in-bits='64' id='type-id-1429'/>
     <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1750'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1414'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1426'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1415'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1658' size-in-bits='64' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1412'/>
     <pointer-type-def type-id='type-id-1753' size-in-bits='64' id='type-id-1757'/>
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1660' size-in-bits='64' id='type-id-1424'/>
     <pointer-type-def type-id='type-id-1760' size-in-bits='64' id='type-id-1764'/>
-    <pointer-type-def type-id='type-id-1661' size-in-bits='64' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1423'/>
-    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1421'/>
+    <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1433'/>
+    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1434'/>
     <namespace-decl name='std'>
-      <class-decl name='collate&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1647'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='collate&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1648'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='593' column='1' id='type-id-1682'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7collateIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7collateIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_collate' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
+          <var-decl name='_M_c_locale_collate' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44204,15 +44204,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44245,21 +44245,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44291,28 +44291,28 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='collate&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1646'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='collate&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='586' column='1' id='type-id-1647'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='593' column='1' id='type-id-1679'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7collateIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7collateIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='737' column='1' elf-symbol-id='_ZNSt7collateIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_collate' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
+          <var-decl name='_M_c_locale_collate' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='599' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44336,15 +44336,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='collate' mangled-name='_ZNSt7collateIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44377,21 +44377,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate' mangled-name='_ZNSt7collateIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7collateIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44423,8 +44423,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='numpunct&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1658'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='numpunct&lt;char&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1659'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1754' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1652' column='1' id='type-id-1753'/>
         </member-type>
@@ -44435,14 +44435,14 @@
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1649' column='1' id='type-id-1756'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8numpunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8numpunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1757' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1655' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-1757'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44450,8 +44450,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44459,27 +44459,27 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_numpunct' mangled-name='_ZNSt8numpunctIcE22_M_initialize_numpunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcE22_M_initialize_numpunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1758' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='41' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EPSt16__numpunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC1EPSt16__numpunct_cacheIcEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-1757'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44487,8 +44487,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIcEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcEC2EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44525,21 +44525,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44575,8 +44575,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='numpunct&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1659'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='numpunct&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1643' column='1' id='type-id-1660'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1761' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1652' column='1' id='type-id-1760'/>
         </member-type>
@@ -44587,14 +44587,14 @@
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1649' column='1' id='type-id-1763'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8numpunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8numpunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1856' column='1' elf-symbol-id='_ZNSt8numpunctIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1764' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1655' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-1764'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44602,8 +44602,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44611,27 +44611,27 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_numpunct' mangled-name='_ZNSt8numpunctIwE22_M_initialize_numpunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwE22_M_initialize_numpunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1765' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='127' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EPSt16__numpunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EPSt16__numpunct_cacheIwEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-1764'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44639,8 +44639,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct' mangled-name='_ZNSt8numpunctIwEC2EP15__locale_structm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwEC1EP15__locale_structm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44677,21 +44677,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct' mangled-name='_ZNSt8numpunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/numeric_members.cc' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8numpunctIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -44728,7 +44728,7 @@
         </member-function>
       </class-decl>
       <class-decl name='__numpunct_cache&lt;char&gt;' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1570' column='1' id='type-id-1754'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
@@ -44757,66 +44757,66 @@
           <var-decl name='_M_thousands_sep' type-id='type-id-16' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1580' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='592'>
-          <var-decl name='_M_atoms_out' type-id='type-id-1847' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
+          <var-decl name='_M_atoms_out' type-id='type-id-1818' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='880'>
-          <var-decl name='_M_atoms_in' type-id='type-id-1848' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
+          <var-decl name='_M_atoms_in' type-id='type-id-1819' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
-            <parameter type-id='type-id-1850'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
+            <parameter type-id='type-id-1821'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt16__numpunct_cacheIcE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1851' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1822' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1849' is-artificial='yes'/>
+            <parameter type-id='type-id-1820' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__numpunct_cache&lt;wchar_t&gt;' size-in-bits='2688' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1570' column='1' id='type-id-1761'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1572' column='1'/>
         </data-member>
@@ -44845,66 +44845,66 @@
           <var-decl name='_M_thousands_sep' type-id='type-id-409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1580' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='_M_atoms_out' type-id='type-id-1852' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
+          <var-decl name='_M_atoms_out' type-id='type-id-1823' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1586' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1792'>
-          <var-decl name='_M_atoms_in' type-id='type-id-1853' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
+          <var-decl name='_M_atoms_in' type-id='type-id-1824' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1592' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2624'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1594' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
-            <parameter type-id='type-id-1855'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <parameter type-id='type-id-1826'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1596' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt16__numpunct_cacheIwE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1856' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1827' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='80' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__numpunct_cache' mangled-name='_ZNSt16__numpunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16__numpunct_cacheIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='moneypunct&lt;char, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;char, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1656'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1732'/>
@@ -44916,7 +44916,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1735' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1734'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIcLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb1EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIcLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb1EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1736' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -44926,7 +44926,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-1736'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44934,8 +44934,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44944,28 +44944,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1737' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='208' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC2EPSt18__moneypunct_cacheIcLb1EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-1736'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -44973,8 +44973,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45036,21 +45036,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb1EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1418' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45110,8 +45110,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='moneypunct&lt;wchar_t, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;wchar_t, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1658'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1746'/>
@@ -45123,7 +45123,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1749' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1748'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIwLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb1EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIwLb1EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb1EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1750' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -45133,7 +45133,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45141,8 +45141,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45151,28 +45151,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1751' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='541' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EPSt18__moneypunct_cacheIwLb1EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EPSt18__moneypunct_cacheIwLb1EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45180,8 +45180,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45243,21 +45243,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb1EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1430' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45318,7 +45318,7 @@
         </member-function>
       </class-decl>
       <class-decl name='__moneypunct_cache&lt;char, true&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1735'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -45362,63 +45362,63 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='800'>
-          <var-decl name='_M_atoms' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <parameter type-id='type-id-1838'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
+            <parameter type-id='type-id-1809'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1839' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1810' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb1EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
+            <parameter type-id='type-id-1808' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__moneypunct_cache&lt;wchar_t, true&gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1749'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -45462,56 +45462,56 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
-          <var-decl name='_M_atoms' type-id='type-id-1840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
-            <parameter type-id='type-id-1845'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
+            <parameter type-id='type-id-1816'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1846' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1817' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb1EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1844' is-artificial='yes'/>
+            <parameter type-id='type-id-1815' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45519,7 +45519,7 @@
       </class-decl>
       <class-decl name='money_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='840' column='1' id='type-id-1723'>
         <member-type access='private'>
-          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-1804'>
+          <enum-decl name='part' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='843' column='1' id='type-id-1834'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='none' value='0'/>
             <enumerator name='space' value='1'/>
@@ -45529,7 +45529,7 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-1805'>
+          <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='849' column='1' id='type-id-1835'>
             <underlying-type type-id='type-id-21'/>
             <enumerator name='_S_minus' value='0'/>
             <enumerator name='_S_zero' value='1'/>
@@ -45544,7 +45544,7 @@
           </class-decl>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='_S_default_pattern' type-id='type-id-1806' mangled-name='_ZNSt10money_base18_S_default_patternE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='846' column='1' elf-symbol-id='_ZNSt10money_base18_S_default_patternE@@GLIBCXX_3.4'/>
+          <var-decl name='_S_default_pattern' type-id='type-id-1836' mangled-name='_ZNSt10money_base18_S_default_patternE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='846' column='1' elf-symbol-id='_ZNSt10money_base18_S_default_patternE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' static='yes'>
           <var-decl name='_S_atoms' type-id='type-id-4' mangled-name='_ZNSt10money_base8_S_atomsE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='857' column='1' elf-symbol-id='_ZNSt10money_base8_S_atomsE@@GLIBCXX_3.4'/>
@@ -45558,8 +45558,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='moneypunct&lt;char, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1654'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;char, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1655'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='940' column='1' id='type-id-1724'/>
@@ -45571,7 +45571,7 @@
           <typedef-decl name='__cache_type' type-id='type-id-1727' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1726'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIcLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb0EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIcLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIcLb0EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1728' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -45581,7 +45581,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-1728'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45589,8 +45589,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45599,28 +45599,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1729' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='359' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC2EPSt18__moneypunct_cacheIcLb0EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-1728'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45628,8 +45628,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -45691,21 +45691,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIcLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1416' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45766,7 +45766,7 @@
         </member-function>
       </class-decl>
       <class-decl name='__moneypunct_cache&lt;char, false&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1727'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -45810,85 +45810,85 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='800'>
-          <var-decl name='_M_atoms' type-id='type-id-1833' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='888'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-1835'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
+            <parameter type-id='type-id-1806'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1836' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1807' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIcLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
+            <parameter type-id='type-id-1805' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='money_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1652'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1653'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1526' column='1' id='type-id-1709'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1710'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1710'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1528' column='1' id='type-id-1711'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45898,7 +45898,7 @@
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <parameter type-id='type-id-412' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <return type-id='type-id-1710'/>
@@ -45909,7 +45909,7 @@
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <return type-id='type-id-1710'/>
@@ -45919,39 +45919,39 @@
           <function-decl name='_M_insert&lt;false&gt;' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES3_S3_RSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb0EEES3_S3_RSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert&lt;true&gt;' mangled-name='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES3_S3_RSt8ios_basecRKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE9_M_insertILb1EEES3_S3_RSt8ios_basecRKSs@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1712' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1710' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1709' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1713' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -45961,10 +45961,10 @@
             <parameter type-id='type-id-1714' is-artificial='yes'/>
             <parameter type-id='type-id-1710'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1709'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -45972,37 +45972,37 @@
             <parameter type-id='type-id-1714' is-artificial='yes'/>
             <parameter type-id='type-id-1710'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1709'/>
             <parameter type-id='type-id-1715'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='money_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1650'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1651'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1376' column='1' id='type-id-1695'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1696'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1696'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1378' column='1' id='type-id-1697'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46013,8 +46013,8 @@
             <parameter type-id='type-id-1696' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <parameter type-id='type-id-1209' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <return type-id='type-id-1696'/>
           </function-decl>
@@ -46025,8 +46025,8 @@
             <parameter type-id='type-id-1696' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <parameter type-id='type-id-1699' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <return type-id='type-id-1696'/>
           </function-decl>
@@ -46036,10 +46036,10 @@
             <parameter type-id='type-id-1698' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1696' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -46047,29 +46047,29 @@
             <parameter type-id='type-id-1698' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1696' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1696' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
+            <parameter type-id='type-id-1418' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46080,10 +46080,10 @@
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -46092,15 +46092,15 @@
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-1696'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-1701'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='moneypunct&lt;wchar_t, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1656'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='moneypunct&lt;wchar_t, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='934' column='1' id='type-id-1657'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1723'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1740' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='943' column='1' id='type-id-1739'/>
@@ -46112,7 +46112,7 @@
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='941' column='1' id='type-id-1742'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt10moneypunctIwLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb0EE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt10moneypunctIwLb0EE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1285' column='1' elf-symbol-id='_ZNSt10moneypunctIwLb0EE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1743' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='946' column='1'/>
@@ -46122,7 +46122,7 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1743'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46130,8 +46130,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46140,28 +46140,28 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EE24_M_initialize_moneypunctEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EE24_M_initialize_moneypunctEP15__locale_structPKc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1744' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='724' column='1'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC2EPSt18__moneypunct_cacheIwLb0EEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1743'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46169,8 +46169,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46232,21 +46232,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct' mangled-name='_ZNSt10moneypunctIwLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/monetary_members.cc' line='921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10moneypunctIwLb0EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46307,7 +46307,7 @@
         </member-function>
       </class-decl>
       <class-decl name='__moneypunct_cache&lt;wchar_t, false&gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='866' column='1' id='type-id-1740'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='868' column='1'/>
         </data-member>
@@ -46351,74 +46351,74 @@
           <var-decl name='_M_neg_format' type-id='type-id-1731' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='881' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='864'>
-          <var-decl name='_M_atoms' type-id='type-id-1840' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
+          <var-decl name='_M_atoms' type-id='type-id-1811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='886' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='_M_allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='888' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='911' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
+            <parameter type-id='type-id-1813'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EE8_M_cacheERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EE8_M_cacheERKSt6locale@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1843' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1814' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='69' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__moneypunct_cache' mangled-name='_ZNSt18__moneypunct_cacheIwLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18__moneypunct_cacheIwLb0EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1841' is-artificial='yes'/>
+            <parameter type-id='type-id-1812' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__timepunct&lt;char&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1644'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__timepunct&lt;char&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1645'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1670' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='183' column='1' id='type-id-1669'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt11__timepunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt11__timepunctIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1671' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
+          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='_M_name_timepunct' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='188' column='1'/>
@@ -46436,20 +46436,20 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_timepunct' mangled-name='_ZNSt11__timepunctIcE23_M_initialize_timepunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcE23_M_initialize_timepunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1673' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='66' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-1671'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46457,8 +46457,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46466,14 +46466,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EPSt17__timepunct_cacheIcEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EPSt17__timepunct_cacheIcEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-1671'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46481,8 +46481,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -46553,30 +46553,30 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__timepunct_cache&lt;char&gt;' size-in-bits='3200' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='59' column='1' id='type-id-1670'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' static='yes'>
-          <var-decl name='_S_timezones' type-id='type-id-1857' mangled-name='_ZNSt17__timepunct_cacheIcE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='34' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIcE12_S_timezonesE@@GLIBCXX_3.4'/>
+          <var-decl name='_S_timezones' type-id='type-id-1828' mangled-name='_ZNSt17__timepunct_cacheIcE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='34' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIcE12_S_timezonesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_date_format' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='64' column='1'/>
@@ -46724,71 +46724,71 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
-            <parameter type-id='type-id-1859'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
+            <parameter type-id='type-id-1830'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1858' is-artificial='yes'/>
+            <parameter type-id='type-id-1829' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='money_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1653'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1521' column='1' id='type-id-1654'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1526' column='1' id='type-id-1716'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1717'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1527' column='1' id='type-id-1717'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1528' column='1' id='type-id-1718'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1660' column='1' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46798,7 +46798,7 @@
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1562' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <parameter type-id='type-id-412' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1563' column='1'/>
             <return type-id='type-id-1717'/>
@@ -46809,7 +46809,7 @@
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1585' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1586' column='1'/>
             <return type-id='type-id-1717'/>
@@ -46819,39 +46819,39 @@
           <function-decl name='_M_insert&lt;false&gt;' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb0EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert&lt;true&gt;' mangled-name='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE9_M_insertILb1EEES3_S3_RSt8ios_basewRKSbIwS2_SaIwEE@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1719' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1717' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1716' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='402' column='1'/>
             <parameter type-id='type-id-1720' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='403' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_put' mangled-name='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46861,10 +46861,10 @@
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <parameter type-id='type-id-1717'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1716'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -46872,34 +46872,34 @@
             <parameter type-id='type-id-1721' is-artificial='yes'/>
             <parameter type-id='type-id-1717'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1716'/>
             <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='time_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1663'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1664'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='721' column='1' id='type-id-1777'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1778'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1778'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46908,7 +46908,7 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1779' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1778' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-1777' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
             <parameter type-id='type-id-16' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
@@ -46920,31 +46920,31 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmPKcSB_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPK2tmPKcSB_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1779' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1778' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-1777' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-4' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
             <parameter type-id='type-id-4' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46953,39 +46953,39 @@
           <function-decl name='do_put' mangled-name='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1780' is-artificial='yes'/>
             <parameter type-id='type-id-1778'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1777'/>
             <parameter type-id='type-id-282'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='money_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1651'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='money_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1370' column='1' id='type-id-1652'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1376' column='1' id='type-id-1702'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1703'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1377' column='1' id='type-id-1703'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1378' column='1' id='type-id-1704'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1505' column='1' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -46996,8 +46996,8 @@
             <parameter type-id='type-id-1703' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1422' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <parameter type-id='type-id-1209' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1423' column='1'/>
             <return type-id='type-id-1703'/>
           </function-decl>
@@ -47008,8 +47008,8 @@
             <parameter type-id='type-id-1703' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
             <parameter type-id='type-id-10' name='__intl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1453' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <parameter type-id='type-id-1706' name='__digits' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1454' column='1'/>
             <return type-id='type-id-1703'/>
           </function-decl>
@@ -47019,10 +47019,10 @@
             <parameter type-id='type-id-1705' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1703' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -47030,29 +47030,29 @@
             <parameter type-id='type-id-1705' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1703' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
             <parameter type-id='type-id-1703' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <parameter type-id='type-id-1454' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='133' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <parameter type-id='type-id-1453' name='__units' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='134' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~money_get' mangled-name='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1430' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47063,10 +47063,10 @@
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -47075,35 +47075,35 @@
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-1703'/>
             <parameter type-id='type-id-10'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-1708'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='time_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1661'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1662'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1767'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='374' column='1' id='type-id-1768'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1769'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1769'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47119,8 +47119,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -47130,8 +47130,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -47141,8 +47141,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -47152,8 +47152,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -47163,8 +47163,8 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1769'/>
           </function-decl>
@@ -47178,9 +47178,9 @@
             <parameter type-id='type-id-6' name='__min' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-6' name='__max' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-96' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -47191,9 +47191,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-980' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -47204,9 +47204,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-980' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -47214,30 +47214,30 @@
             <parameter type-id='type-id-1772' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1769' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
             <parameter type-id='type-id-1769' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-4' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='630' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47253,10 +47253,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -47264,10 +47264,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -47275,10 +47275,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -47286,10 +47286,10 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -47297,39 +47297,39 @@
             <parameter type-id='type-id-1770' is-artificial='yes'/>
             <parameter type-id='type-id-1769'/>
             <parameter type-id='type-id-1769'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='messages&lt;char&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1648'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='messages&lt;char&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1649'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-399' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1702' column='1' id='type-id-1686'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8messagesIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIcE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8messagesIcE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIcE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_messages' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
+          <var-decl name='_M_c_locale_messages' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_name_messages' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1709' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47337,15 +47337,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIcEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIcEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcEC2EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47401,21 +47401,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1424' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47446,19 +47446,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__timepunct&lt;wchar_t&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1645'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='__timepunct&lt;wchar_t&gt;' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='177' column='1' id='type-id-1646'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1675' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='183' column='1' id='type-id-1674'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt11__timepunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt11__timepunctIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='322' column='1' elf-symbol-id='_ZNSt11__timepunctIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
           <var-decl name='_M_data' type-id='type-id-1676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='186' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
+          <var-decl name='_M_c_locale_timepunct' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='187' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='_M_name_timepunct' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='188' column='1'/>
@@ -47476,20 +47476,20 @@
         <member-function access='protected'>
           <function-decl name='_M_initialize_timepunct' mangled-name='_ZNSt11__timepunctIwE23_M_initialize_timepunctEP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwE23_M_initialize_timepunctEP15__locale_struct@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1678' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1340' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1'/>
+            <parameter type-id='type-id-1339' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/time_members.cc' line='222' column='1'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-1676'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47497,8 +47497,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47506,14 +47506,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EPSt17__timepunct_cacheIwEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EPSt17__timepunct_cacheIwEm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-1676'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47521,8 +47521,8 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct' mangled-name='_ZNSt11__timepunctIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -47593,30 +47593,30 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct' mangled-name='_ZNSt11__timepunctIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__timepunctIwED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__timepunct_cache&lt;wchar_t&gt;' size-in-bits='3200' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='59' column='1' id='type-id-1675'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <data-member access='public' static='yes'>
-          <var-decl name='_S_timezones' type-id='type-id-1860' mangled-name='_ZNSt17__timepunct_cacheIwE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='43' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIwE12_S_timezonesE@@GLIBCXX_3.4'/>
+          <var-decl name='_S_timezones' type-id='type-id-1831' mangled-name='_ZNSt17__timepunct_cacheIwE12_S_timezonesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' line='43' column='1' elf-symbol-id='_ZNSt17__timepunct_cacheIwE12_S_timezonesE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_date_format' type-id='type-id-395' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='64' column='1'/>
@@ -47764,68 +47764,68 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-1862'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
+            <parameter type-id='type-id-1833'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__timepunct_cache' mangled-name='_ZNSt17__timepunct_cacheIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17__timepunct_cacheIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
+            <parameter type-id='type-id-1832' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='time_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1664'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='715' column='1' id='type-id-1665'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='721' column='1' id='type-id-1781'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1782'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='722' column='1' id='type-id-1782'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='807' column='1' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='736' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47834,7 +47834,7 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1783' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1782' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-1781' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='775' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
             <parameter type-id='type-id-16' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='776' column='1'/>
@@ -47846,31 +47846,31 @@
           <function-decl name='put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmPKwSB_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPK2tmPKwSB_@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1783' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1782' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-1781' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-282' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1143' column='1'/>
             <parameter type-id='type-id-395' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
             <parameter type-id='type-id-395' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1144' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put' mangled-name='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47879,37 +47879,37 @@
           <function-decl name='do_put' mangled-name='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPK2tmcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='1177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPK2tmcc@@GLIBCXX_3.4'>
             <parameter type-id='type-id-1784' is-artificial='yes'/>
             <parameter type-id='type-id-1782'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1781'/>
             <parameter type-id='type-id-282'/>
             <parameter type-id='type-id-16'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='time_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1662'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='time_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='368' column='1' id='type-id-1663'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1767'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='374' column='1' id='type-id-1773'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1774'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='375' column='1' id='type-id-1774'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='682' column='1' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -47925,8 +47925,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -47936,8 +47936,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -47947,8 +47947,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -47958,8 +47958,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -47969,8 +47969,8 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='431' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='432' column='1'/>
             <return type-id='type-id-1774'/>
           </function-decl>
@@ -47984,9 +47984,9 @@
             <parameter type-id='type-id-6' name='__min' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-6' name='__max' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
             <parameter type-id='type-id-96' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='843' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='844' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -47997,9 +47997,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-1084' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -48010,9 +48010,9 @@
             <parameter type-id='type-id-1198' name='__member' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='959' column='1'/>
             <parameter type-id='type-id-1084' name='__names' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
             <parameter type-id='type-id-96' name='__indexlen' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='960' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='961' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -48020,30 +48020,30 @@
             <parameter type-id='type-id-1776' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1774' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
             <parameter type-id='type-id-1774' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='628' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-263' name='__tm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='629' column='1'/>
             <parameter type-id='type-id-395' name='__format' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='630' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get' mangled-name='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -48059,10 +48059,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -48070,10 +48070,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -48081,10 +48081,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -48092,10 +48092,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -48103,10 +48103,10 @@
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-1774'/>
             <parameter type-id='type-id-1774'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
             <parameter type-id='type-id-263'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -48122,32 +48122,32 @@
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='messages&lt;wchar_t&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1649'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+      <class-decl name='messages&lt;wchar_t&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1695' column='1' id='type-id-1650'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-400' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1702' column='1' id='type-id-1691'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt8messagesIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIwE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt8messagesIwE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1864' column='1' elf-symbol-id='_ZNSt8messagesIwE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_messages' type-id='type-id-1340' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
+          <var-decl name='_M_c_locale_messages' type-id='type-id-1339' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1708' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_M_name_messages' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1709' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -48155,15 +48155,15 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='messages' mangled-name='_ZNSt8messagesIwEC2EP15__locale_structPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwEC1EP15__locale_structPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-1340'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1339'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
@@ -48219,21 +48219,21 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages' mangled-name='_ZNSt8messagesIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8messagesIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -48265,867 +48265,867 @@
         </member-function>
       </class-decl>
       <class-decl name='num_get&lt;char, std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-1188'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1447' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1446'/>
+          <typedef-decl name='iter_type' type-id='type-id-1446' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1445'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1448'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1447'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-96'/>
             <parameter type-id='type-id-16'/>
-            <return type-id='type-id-1450'/>
+            <return type-id='type-id-1449'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
             <parameter type-id='type-id-1204' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
             <parameter type-id='type-id-1207' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
             <parameter type-id='type-id-1208' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
             <parameter type-id='type-id-1209' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1446' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1445' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1445' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
             <parameter type-id='type-id-1210' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;short unsigned int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_float' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <parameter type-id='type-id-1454' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <parameter type-id='type-id-1453' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long int&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1451' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1447' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1447' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1450' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1446' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1330'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1329'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
             <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1457'/>
-            <return type-id='type-id-1446'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1458'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1457'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1459'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1458'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1461'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1460'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-1446'/>
+            <parameter type-id='type-id-1461'/>
+            <return type-id='type-id-1445'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1462'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1464'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1463'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-1446'/>
-            <parameter type-id='type-id-1446'/>
+            <parameter type-id='type-id-1448' is-artificial='yes'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1465'/>
+            <return type-id='type-id-1446'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='num_get&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1917' column='1' id='type-id-1237'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1468' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1467'/>
+          <typedef-decl name='iter_type' type-id='type-id-1467' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1924' column='1' id='type-id-1466'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1469'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1923' column='1' id='type-id-1468'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2237' column='1' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
             <parameter type-id='type-id-395'/>
             <parameter type-id='type-id-96'/>
             <parameter type-id='type-id-409'/>
-            <return type-id='type-id-1450'/>
+            <return type-id='type-id-1449'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1964' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
             <parameter type-id='type-id-1204' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1965' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2000' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2001' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2005' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2006' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2010' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2011' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2015' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2016' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2021' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2022' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2026' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2027' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2059' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
             <parameter type-id='type-id-1207' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2060' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2064' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
             <parameter type-id='type-id-1208' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2065' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2069' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
             <parameter type-id='type-id-1209' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2070' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE3getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1467' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1466' name='__in' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1466' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2101' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
             <parameter type-id='type-id-1210' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2102' column='1'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIyEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1206' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIxEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1205' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intImEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1203' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIjEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1201' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;short unsigned int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intItEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1200' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_float' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16_M_extract_floatES3_S3_RSt8ios_baseRSt12_Ios_IostateRSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <parameter type-id='type-id-1454' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='147' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <parameter type-id='type-id-1453' name='__xtrc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='148' column='1'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_extract_int&lt;long int&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE14_M_extract_intIlEES3_S3_S3_RSt8ios_baseRSt12_Ios_IostateRT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1471' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1468' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1468' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
-            <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
+            <parameter type-id='type-id-1470' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' name='__beg' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1467' name='__end' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='372' column='1'/>
+            <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
             <parameter type-id='type-id-1202' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='373' column='1'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_get' mangled-name='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1330'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1329'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
             <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1457'/>
-            <return type-id='type-id-1467'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1458'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1457'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRj@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1459'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1458'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1460'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1461'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-1467'/>
+            <parameter type-id='type-id-1461'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRf@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1462'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1464'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1463'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
-            <parameter type-id='type-id-1465'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1464'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_get' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE6do_getES3_S3_RSt8ios_baseRSt12_Ios_IostateRPv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1467'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1456'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
             <parameter type-id='type-id-1466'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1465'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='num_put&lt;char, std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-1224'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1472'/>
+          <typedef-decl name='char_type' type-id='type-id-16' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1471'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1474' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1473'/>
+          <typedef-decl name='iter_type' type-id='type-id-1473' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1472'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
             <parameter type-id='type-id-10' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2339' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2349' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basece@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2402' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE3putES3_RSt8ios_basecPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1472' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1472' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1471' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
             <parameter type-id='type-id-18' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2423' column='1'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE12_M_group_intEPKcmcRSt8ios_basePcS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-16' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
-            <parameter type-id='type-id-1452'/>
+            <parameter type-id='type-id-1451'/>
             <parameter type-id='type-id-98' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-98' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
@@ -49134,7 +49134,7 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE14_M_group_floatEPKcmcS6_PcS7_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-16' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='937' column='1'/>
@@ -49147,10 +49147,10 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_pad' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6_M_padEclRSt8ios_basePcPKcRi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6_M_padEclRSt8ios_basePcPKcRi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-1168' name='__w' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-98' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-4' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
@@ -49159,280 +49159,280 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;long double&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIeEES3_S3_RSt8ios_baseccT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;double&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE15_M_insert_floatIdEES3_S3_RSt8ios_baseccT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIyEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIxEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intImEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long int&gt;' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES3_S3_RSt8ios_basecT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE13_M_insert_intIlEES3_S3_RSt8ios_basecT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1475' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1474' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1474' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1473' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-16' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-10'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-32'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-410'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1472'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-281'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basece' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basece@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE6do_putES3_RSt8ios_basecPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1476' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1475' is-artificial='yes'/>
             <parameter type-id='type-id-1472'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1474'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='num_put&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2253' column='1' id='type-id-1235'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1370'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-1478' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1477'/>
+          <typedef-decl name='iter_type' type-id='type-id-1477' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2260' column='1' id='type-id-1476'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1479'/>
+          <typedef-decl name='char_type' type-id='type-id-409' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2259' column='1' id='type-id-1478'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-1341' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
+          <var-decl name='id' type-id='type-id-1340' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2517' column='1' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE2idE@@GLIBCXX_3.4'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2Em@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-96'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
             <parameter type-id='type-id-10' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2292' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2334' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2338' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2339' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2344' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2348' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2349' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2397' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2401' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2402' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE3putES3_RSt8ios_basewPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
-            <parameter type-id='type-id-1479' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
+            <parameter type-id='type-id-1478' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2422' column='1'/>
             <parameter type-id='type-id-18' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2423' column='1'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_int' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE12_M_group_intEPKcmwRSt8ios_basePwS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
             <parameter type-id='type-id-409' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='836' column='1'/>
-            <parameter type-id='type-id-1452'/>
+            <parameter type-id='type-id-1451'/>
             <parameter type-id='type-id-368' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-368' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='837' column='1'/>
@@ -49441,7 +49441,7 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_group_float' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE14_M_group_floatEPKcmwPKwPwS9_Ri@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__grouping' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-96' name='__grouping_size' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='936' column='1'/>
             <parameter type-id='type-id-409' name='__sep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='937' column='1'/>
@@ -49454,10 +49454,10 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_pad' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6_M_padEwlRSt8ios_basePwPKwRi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6_M_padEwlRSt8ios_basePwPKwRi@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-1168' name='__w' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='777' column='1'/>
             <parameter type-id='type-id-368' name='__new' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-395' name='__cs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
             <parameter type-id='type-id-1198' name='__len' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='778' column='1'/>
@@ -49466,165 +49466,165 @@
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;long double&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIeEES3_S3_RSt8ios_basewcT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIeEES3_S3_RSt8ios_basewcT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-412' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_float&lt;double&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE15_M_insert_floatIdEES3_S3_RSt8ios_basewcT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-16' name='__mod' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='972' column='1'/>
             <parameter type-id='type-id-281' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='973' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long unsigned int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIyEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-410' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long long int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIxEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-286' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long unsigned int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intImEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-53' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_insert_int&lt;long int&gt;' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES3_S3_RSt8ios_basewT_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE13_M_insert_intIlEES3_S3_RSt8ios_basewT_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1480' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1478' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
-            <parameter type-id='type-id-1452' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1479' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1477' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
+            <parameter type-id='type-id-1451' name='__io' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-409' name='__fill' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='848' column='1'/>
             <parameter type-id='type-id-32' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='849' column='1'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~num_put' mangled-name='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='2'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-10'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-32'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-53'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewx' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2483' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewx@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewy@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-410'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewd@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-281'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewe@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-412'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_put' mangled-name='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPKv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE6do_putES3_RSt8ios_basewPKv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
-            <parameter type-id='type-id-1477'/>
-            <parameter type-id='type-id-1455'/>
-            <parameter type-id='type-id-1479'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <parameter type-id='type-id-1454'/>
+            <parameter type-id='type-id-1478'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1477'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -49660,7 +49660,7 @@
     <qualified-type-def type-id='type-id-3142' const='yes' id='type-id-3147'/>
     <qualified-type-def type-id='type-id-3146' const='yes' id='type-id-3266'/>
     <qualified-type-def type-id='type-id-3101' const='yes' id='type-id-3267'/>
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-3102'/>
+    <qualified-type-def type-id='type-id-1330' const='yes' id='type-id-3102'/>
     <namespace-decl name='std'>
       <function-decl name='getline&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-2820' name='__in' filepath='../../../.././libstdc++-v3/src/c++98/istream.cc' line='279' column='1'/>
@@ -49912,7 +49912,7 @@
           <function-decl name='_M_reserve_block' mangled-name='_ZN9__gnu_cxx6__poolILb1EE16_M_reserve_blockEmm' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb1EE16_M_reserve_blockEmm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-3290' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-96' name='__bytes' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='346' column='1'/>
-            <parameter type-id='type-id-1376' name='__thread_id' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='346' column='1'/>
+            <parameter type-id='type-id-1375' name='__thread_id' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='346' column='1'/>
             <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
@@ -50050,7 +50050,7 @@
           <function-decl name='_M_reserve_block' mangled-name='_ZN9__gnu_cxx6__poolILb0EE16_M_reserve_blockEmm' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx6__poolILb0EE16_M_reserve_blockEmm@@GLIBCXX_3.4.4'>
             <parameter type-id='type-id-3282' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-96' name='__bytes' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='128' column='1'/>
-            <parameter type-id='type-id-1376' name='__thread_id' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='128' column='1'/>
+            <parameter type-id='type-id-1375' name='__thread_id' filepath='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' line='128' column='1'/>
             <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
@@ -50173,19 +50173,19 @@
     <pointer-type-def type-id='type-id-1794' size-in-bits='64' id='type-id-1573'/>
     <qualified-type-def type-id='type-id-1561' const='yes' id='type-id-3349'/>
     <qualified-type-def type-id='type-id-1562' const='yes' id='type-id-3350'/>
-    <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1809'/>
-    <pointer-type-def type-id='type-id-1809' size-in-bits='64' id='type-id-1795'/>
+    <qualified-type-def type-id='type-id-1555' const='yes' id='type-id-1839'/>
+    <pointer-type-def type-id='type-id-1839' size-in-bits='64' id='type-id-1795'/>
     <qualified-type-def type-id='type-id-1795' const='yes' id='type-id-1559'/>
     <qualified-type-def type-id='type-id-1585' const='yes' id='type-id-3351'/>
     <qualified-type-def type-id='type-id-1580' const='yes' id='type-id-1796'/>
     <pointer-type-def type-id='type-id-1796' size-in-bits='64' id='type-id-1592'/>
     <qualified-type-def type-id='type-id-1581' const='yes' id='type-id-3352'/>
     <qualified-type-def type-id='type-id-1582' const='yes' id='type-id-3353'/>
-    <qualified-type-def type-id='type-id-1575' const='yes' id='type-id-1810'/>
-    <pointer-type-def type-id='type-id-1810' size-in-bits='64' id='type-id-1797'/>
+    <qualified-type-def type-id='type-id-1575' const='yes' id='type-id-1840'/>
+    <pointer-type-def type-id='type-id-1840' size-in-bits='64' id='type-id-1797'/>
     <qualified-type-def type-id='type-id-1797' const='yes' id='type-id-1579'/>
-    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1481'/>
-    <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1480'/>
+    <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1480' const='yes' id='type-id-1479'/>
     <qualified-type-def type-id='type-id-2938' const='yes' id='type-id-3354'/>
     <qualified-type-def type-id='type-id-2942' const='yes' id='type-id-3355'/>
     <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-3356'/>
@@ -50210,7 +50210,7 @@
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::num_put&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1476'/>
+        <parameter type-id='type-id-1475'/>
         <return type-id='type-id-3136'/>
       </function-decl>
       <function-decl name='__ostream_fill&lt;char, std::char_traits&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream_insert.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -50228,7 +50228,7 @@
         <return type-id='type-id-1558'/>
       </function-decl>
       <function-decl name='__check_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1481'/>
+        <parameter type-id='type-id-1480'/>
         <return type-id='type-id-3137'/>
       </function-decl>
       <function-decl name='__ostream_fill&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream_insert.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -50659,8 +50659,8 @@
     <qualified-type-def type-id='type-id-3403' const='yes' id='type-id-3404'/>
     <qualified-type-def type-id='type-id-522' id='type-id-3405'/>
     <qualified-type-def type-id='type-id-526' id='type-id-3406'/>
-    <qualified-type-def type-id='type-id-1501' id='type-id-1198'/>
-    <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1501'/>
+    <qualified-type-def type-id='type-id-1500' id='type-id-1198'/>
+    <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1500'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__pool_alloc_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='77' column='1' id='type-id-3384'>
         <member-type access='protected'>
@@ -51403,17 +51403,17 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-2269' const='yes' id='type-id-2301'/>
-    <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-2295'/>
+    <pointer-type-def type-id='type-id-2301' size-in-bits='64' id='type-id-2296'/>
     <qualified-type-def type-id='type-id-2245' const='yes' id='type-id-2302'/>
-    <pointer-type-def type-id='type-id-2302' size-in-bits='64' id='type-id-2297'/>
+    <pointer-type-def type-id='type-id-2302' size-in-bits='64' id='type-id-2298'/>
     <pointer-type-def type-id='type-id-3470' size-in-bits='64' id='type-id-3471'/>
     <pointer-type-def type-id='type-id-3472' size-in-bits='64' id='type-id-3473'/>
     <pointer-type-def type-id='type-id-3474' size-in-bits='64' id='type-id-3475'/>
-    <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2294'/>
+    <pointer-type-def type-id='type-id-2269' size-in-bits='64' id='type-id-2295'/>
     <pointer-type-def type-id='type-id-3476' size-in-bits='64' id='type-id-3477'/>
     <pointer-type-def type-id='type-id-3478' size-in-bits='64' id='type-id-3479'/>
     <pointer-type-def type-id='type-id-3480' size-in-bits='64' id='type-id-3481'/>
-    <pointer-type-def type-id='type-id-2245' size-in-bits='64' id='type-id-2296'/>
+    <pointer-type-def type-id='type-id-2245' size-in-bits='64' id='type-id-2297'/>
     <pointer-type-def type-id='type-id-3482' size-in-bits='64' id='type-id-3483'/>
     <namespace-decl name='std'>
       <class-decl name='logic_error' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/stdexcept' line='56' column='1' id='type-id-2269'>
@@ -51423,42 +51423,42 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='logic_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='logic_error' mangled-name='_ZNSt11logic_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorC2ERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~logic_error' mangled-name='_ZNSt11logic_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11logic_errorD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2294' is-artificial='yes'/>
+            <parameter type-id='type-id-2295' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt11logic_error4whatEv' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt11logic_error4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2295' is-artificial='yes'/>
+            <parameter type-id='type-id-2296' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -51470,42 +51470,42 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='runtime_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='runtime_error' mangled-name='_ZNSt13runtime_errorC2ERKSs' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorC1ERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' mangled-name='_ZNSt13runtime_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~runtime_error' mangled-name='_ZNSt13runtime_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13runtime_errorD2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2296' is-artificial='yes'/>
+            <parameter type-id='type-id-2297' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt13runtime_error4whatEv' filepath='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13runtime_error4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2297' is-artificial='yes'/>
+            <parameter type-id='type-id-2298' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -51779,13 +51779,13 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1494'/>
+    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1493'/>
     <qualified-type-def type-id='type-id-1215' id='type-id-1218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1494' size-in-bits='64' id='type-id-1215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-1214' const='yes' id='type-id-3484'/>
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1496'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1495'/>
     <qualified-type-def type-id='type-id-1251' id='type-id-1254'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1495' size-in-bits='64' id='type-id-1251'/>
     <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-3485'/>
     <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1219'/>
     <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1216'/>
@@ -51793,12 +51793,12 @@
     <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-1252'/>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1330' id='type-id-1204'/>
-    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-1330'/>
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1495'/>
-    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1217'/>
-    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1497'/>
-    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1253'/>
+    <qualified-type-def type-id='type-id-1329' id='type-id-1204'/>
+    <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-1329'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1494'/>
+    <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-1217'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1496'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1253'/>
     <namespace-decl name='std'>
       <function-decl name='__copy_streambufs_eof&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb' filepath='../../../.././libstdc++-v3/src/c++98/streambuf.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb@@GLIBCXX_3.4.9'>
         <parameter type-id='type-id-1113' name='__sbin' filepath='../../../.././libstdc++-v3/src/c++98/streambuf.cc' line='38' column='1'/>
@@ -51838,7 +51838,7 @@
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-3184'/>
     <pointer-type-def type-id='type-id-2045' size-in-bits='64' id='type-id-2050'/>
     <reference-type-def kind='lvalue' type-id='type-id-1516' size-in-bits='64' id='type-id-3506'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1594'/>
     <pointer-type-def type-id='type-id-3489' size-in-bits='64' id='type-id-3507'/>
     <qualified-type-def type-id='type-id-3507' const='yes' id='type-id-3508'/>
     <pointer-type-def type-id='type-id-3493' size-in-bits='64' id='type-id-3509'/>
@@ -51852,7 +51852,7 @@
     <namespace-decl name='std'>
       <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='789' column='1' id='type-id-2045'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1099'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1513'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-1512'/>
         <member-function access='private'>
           <function-decl name='basic_iostream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2050' is-artificial='yes'/>
@@ -52325,7 +52325,7 @@
         </member-function>
       </class-decl>
       <class-decl name='ostrstream' size-in-bits='2880' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='144' column='1' id='type-id-3493'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1513'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1512'/>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_buf' type-id='type-id-3501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/backward/strstream' line='157' column='1'/>
         </data-member>
@@ -52617,29 +52617,29 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='fpos' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
+            <parameter type-id='type-id-1594' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='fpos' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
+            <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-1275'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='max&lt;long int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-580'/>
-        <parameter type-id='type-id-580'/>
-        <return type-id='type-id-580'/>
+        <parameter type-id='type-id-531'/>
+        <parameter type-id='type-id-531'/>
+        <return type-id='type-id-531'/>
       </function-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-2229' const='yes' id='type-id-2298'/>
-    <pointer-type-def type-id='type-id-2298' size-in-bits='64' id='type-id-2234'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2300' size-in-bits='64' id='type-id-3516'/>
+    <qualified-type-def type-id='type-id-2229' const='yes' id='type-id-2299'/>
+    <pointer-type-def type-id='type-id-2299' size-in-bits='64' id='type-id-2234'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2294' size-in-bits='64' id='type-id-3516'/>
     <qualified-type-def type-id='type-id-3517' id='type-id-3518'/>
     <reference-type-def kind='lvalue' type-id='type-id-2229' size-in-bits='64' id='type-id-3517'/>
     <pointer-type-def type-id='type-id-2229' size-in-bits='64' id='type-id-2232'/>
@@ -52647,7 +52647,7 @@
     <qualified-type-def type-id='type-id-3520' id='type-id-3521'/>
     <reference-type-def kind='lvalue' type-id='type-id-2232' size-in-bits='64' id='type-id-3520'/>
     <namespace-decl name='std'>
-      <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-2300'>
+      <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-2294'>
         <underlying-type type-id='type-id-21'/>
         <enumerator name='_S_red' value='0'/>
         <enumerator name='_S_black' value='1'/>
@@ -52660,7 +52660,7 @@
           <typedef-decl name='_Const_Base_ptr' type-id='type-id-2234' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='93' column='1' id='type-id-2265'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_color' type-id='type-id-2300' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='95' column='1'/>
+          <var-decl name='_M_color' type-id='type-id-2294' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='95' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='_M_parent' type-id='type-id-2260' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='96' column='1'/>
@@ -52789,7 +52789,7 @@
     <qualified-type-def type-id='type-id-3601' const='yes' id='type-id-3602'/>
     <pointer-type-def type-id='type-id-3603' size-in-bits='64' id='type-id-3604'/>
     <pointer-type-def type-id='type-id-3605' size-in-bits='64' id='type-id-3606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-53' size-in-bits='64' id='type-id-1460'/>
+    <reference-type-def kind='lvalue' type-id='type-id-53' size-in-bits='64' id='type-id-1459'/>
     <namespace-decl name='std'>
       <class-decl name='valarray&lt;long unsigned int&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='118' column='1' id='type-id-3576'>
         <member-type access='private'>
@@ -52928,16 +52928,16 @@
           <function-decl name='operator[]' mangled-name='_ZNSt8valarrayImEixEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='578' column='1' declared-inline='yes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8valarrayImEixEm@@GLIBCXX_3.4'>
             <parameter type-id='type-id-3602' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-96' name='__i' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/valarray' line='578' column='1'/>
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1459'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='slice_array&lt;long unsigned int&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='124' column='1' id='type-id-3568'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='192' column='1'/>
+          <var-decl name='_M_sz' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='192' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_stride' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='193' column='1'/>
+          <var-decl name='_M_stride' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='193' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_array' type-id='type-id-3534' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/slice_array.h' line='194' column='1'/>
@@ -53055,7 +53055,7 @@
       </class-decl>
       <class-decl name='mask_array&lt;long unsigned int&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/mask_array.h' line='63' column='1' id='type-id-3557'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/mask_array.h' line='131' column='1'/>
+          <var-decl name='_M_sz' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/mask_array.h' line='131' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_mask' type-id='type-id-3531' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/mask_array.h' line='132' column='1'/>
@@ -53306,7 +53306,7 @@
       </class-decl>
       <class-decl name='indirect_array&lt;long unsigned int&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/indirect_array.h' line='63' column='1' id='type-id-3550'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-1376' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/indirect_array.h' line='134' column='1'/>
+          <var-decl name='_M_sz' type-id='type-id-1375' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/indirect_array.h' line='134' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_index' type-id='type-id-3534' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/indirect_array.h' line='135' column='1'/>
@@ -53418,16 +53418,16 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='352' id='type-id-1840'>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='352' id='type-id-1811'>
       <subrange length='11' type-id='type-id-106' id='type-id-1863'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='832' id='type-id-1853'>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='832' id='type-id-1824'>
       <subrange length='26' type-id='type-id-106' id='type-id-1864'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='1152' id='type-id-1852'>
+    <array-type-def dimensions='1' type-id='type-id-409' size-in-bits='1152' id='type-id-1823'>
       <subrange length='36' type-id='type-id-106' id='type-id-1865'/>
     </array-type-def>
-    <qualified-type-def type-id='type-id-1354' const='yes' id='type-id-1789'/>
+    <qualified-type-def type-id='type-id-1353' const='yes' id='type-id-1789'/>
     <pointer-type-def type-id='type-id-1789' size-in-bits='64' id='type-id-1540'/>
     <qualified-type-def type-id='type-id-1537' const='yes' id='type-id-1790'/>
     <pointer-type-def type-id='type-id-1790' size-in-bits='64' id='type-id-1546'/>
@@ -53437,18 +53437,18 @@
     <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
     <qualified-type-def type-id='type-id-1550' const='yes' id='type-id-1793'/>
     <pointer-type-def type-id='type-id-1793' size-in-bits='64' id='type-id-1553'/>
-    <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1869'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1869' size-in-bits='64' id='type-id-1842'/>
-    <pointer-type-def type-id='type-id-1869' size-in-bits='64' id='type-id-3644'/>
-    <qualified-type-def type-id='type-id-1749' const='yes' id='type-id-1870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1870' size-in-bits='64' id='type-id-1845'/>
-    <pointer-type-def type-id='type-id-1870' size-in-bits='64' id='type-id-3645'/>
-    <qualified-type-def type-id='type-id-1761' const='yes' id='type-id-1872'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1872' size-in-bits='64' id='type-id-1855'/>
-    <pointer-type-def type-id='type-id-1872' size-in-bits='64' id='type-id-3646'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1874' size-in-bits='64' id='type-id-3647'/>
-    <qualified-type-def type-id='type-id-1675' const='yes' id='type-id-1876'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1876' size-in-bits='64' id='type-id-1862'/>
+    <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1872'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1872' size-in-bits='64' id='type-id-1813'/>
+    <pointer-type-def type-id='type-id-1872' size-in-bits='64' id='type-id-3644'/>
+    <qualified-type-def type-id='type-id-1749' const='yes' id='type-id-1873'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1873' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-1873' size-in-bits='64' id='type-id-3645'/>
+    <qualified-type-def type-id='type-id-1761' const='yes' id='type-id-1875'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1875' size-in-bits='64' id='type-id-1826'/>
+    <pointer-type-def type-id='type-id-1875' size-in-bits='64' id='type-id-3646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1877' size-in-bits='64' id='type-id-3647'/>
+    <qualified-type-def type-id='type-id-1675' const='yes' id='type-id-1879'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1879' size-in-bits='64' id='type-id-1833'/>
     <qualified-type-def type-id='type-id-3648' const='yes' id='type-id-3649'/>
     <pointer-type-def type-id='type-id-3649' size-in-bits='64' id='type-id-3650'/>
     <qualified-type-def type-id='type-id-3650' const='yes' id='type-id-3651'/>
@@ -53458,43 +53458,43 @@
     <qualified-type-def type-id='type-id-3656' const='yes' id='type-id-3657'/>
     <pointer-type-def type-id='type-id-3657' size-in-bits='64' id='type-id-3658'/>
     <qualified-type-def type-id='type-id-3658' const='yes' id='type-id-3659'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1627' size-in-bits='64' id='type-id-2049'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1812' size-in-bits='64' id='type-id-3660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1628' size-in-bits='64' id='type-id-2049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1842' size-in-bits='64' id='type-id-3660'/>
     <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-3661'/>
     <qualified-type-def type-id='type-id-3164' id='type-id-3662'/>
-    <qualified-type-def type-id='type-id-1602' const='yes' id='type-id-3663'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1815' size-in-bits='64' id='type-id-3664'/>
-    <qualified-type-def type-id='type-id-1651' const='yes' id='type-id-1818'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1818' size-in-bits='64' id='type-id-3665'/>
-    <pointer-type-def type-id='type-id-1818' size-in-bits='64' id='type-id-1707'/>
+    <qualified-type-def type-id='type-id-1603' const='yes' id='type-id-3663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1845' size-in-bits='64' id='type-id-3664'/>
+    <qualified-type-def type-id='type-id-1652' const='yes' id='type-id-1848'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1848' size-in-bits='64' id='type-id-3665'/>
+    <pointer-type-def type-id='type-id-1848' size-in-bits='64' id='type-id-1707'/>
     <qualified-type-def type-id='type-id-1707' const='yes' id='type-id-1705'/>
     <qualified-type-def type-id='type-id-1702' const='yes' id='type-id-3666'/>
-    <qualified-type-def type-id='type-id-1653' const='yes' id='type-id-1821'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1821' size-in-bits='64' id='type-id-3667'/>
-    <pointer-type-def type-id='type-id-1821' size-in-bits='64' id='type-id-1721'/>
+    <qualified-type-def type-id='type-id-1654' const='yes' id='type-id-1851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1851' size-in-bits='64' id='type-id-3667'/>
+    <pointer-type-def type-id='type-id-1851' size-in-bits='64' id='type-id-1721'/>
     <qualified-type-def type-id='type-id-1721' const='yes' id='type-id-1719'/>
     <qualified-type-def type-id='type-id-1716' const='yes' id='type-id-3668'/>
-    <qualified-type-def type-id='type-id-1718' const='yes' id='type-id-1822'/>
+    <qualified-type-def type-id='type-id-1718' const='yes' id='type-id-1852'/>
     <qualified-type-def type-id='type-id-1722' id='type-id-1720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1822' size-in-bits='64' id='type-id-1722'/>
-    <qualified-type-def type-id='type-id-1656' const='yes' id='type-id-1825'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1825' size-in-bits='64' id='type-id-3669'/>
-    <pointer-type-def type-id='type-id-1825' size-in-bits='64' id='type-id-1745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1852' size-in-bits='64' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1855'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1855' size-in-bits='64' id='type-id-3669'/>
+    <pointer-type-def type-id='type-id-1855' size-in-bits='64' id='type-id-1745'/>
     <qualified-type-def type-id='type-id-1745' const='yes' id='type-id-3670'/>
-    <qualified-type-def type-id='type-id-1657' const='yes' id='type-id-1826'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1826' size-in-bits='64' id='type-id-3671'/>
-    <pointer-type-def type-id='type-id-1826' size-in-bits='64' id='type-id-1752'/>
+    <qualified-type-def type-id='type-id-1658' const='yes' id='type-id-1856'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1856' size-in-bits='64' id='type-id-3671'/>
+    <pointer-type-def type-id='type-id-1856' size-in-bits='64' id='type-id-1752'/>
     <qualified-type-def type-id='type-id-1752' const='yes' id='type-id-3672'/>
-    <qualified-type-def type-id='type-id-1469' const='yes' id='type-id-3673'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1828' size-in-bits='64' id='type-id-3674'/>
-    <qualified-type-def type-id='type-id-1662' const='yes' id='type-id-1830'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1830' size-in-bits='64' id='type-id-3675'/>
-    <pointer-type-def type-id='type-id-1830' size-in-bits='64' id='type-id-1775'/>
+    <qualified-type-def type-id='type-id-1468' const='yes' id='type-id-3673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1858' size-in-bits='64' id='type-id-3674'/>
+    <qualified-type-def type-id='type-id-1663' const='yes' id='type-id-1860'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1860' size-in-bits='64' id='type-id-3675'/>
+    <pointer-type-def type-id='type-id-1860' size-in-bits='64' id='type-id-1775'/>
     <qualified-type-def type-id='type-id-1775' const='yes' id='type-id-1776'/>
     <qualified-type-def type-id='type-id-1773' const='yes' id='type-id-3676'/>
-    <qualified-type-def type-id='type-id-1664' const='yes' id='type-id-1832'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1832' size-in-bits='64' id='type-id-3677'/>
-    <pointer-type-def type-id='type-id-1832' size-in-bits='64' id='type-id-1784'/>
+    <qualified-type-def type-id='type-id-1665' const='yes' id='type-id-1862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1862' size-in-bits='64' id='type-id-3677'/>
+    <pointer-type-def type-id='type-id-1862' size-in-bits='64' id='type-id-1784'/>
     <qualified-type-def type-id='type-id-1784' const='yes' id='type-id-1783'/>
     <pointer-type-def type-id='type-id-1537' size-in-bits='64' id='type-id-1544'/>
     <reference-type-def kind='lvalue' type-id='type-id-1544' size-in-bits='64' id='type-id-1545'/>
@@ -53502,16 +53502,16 @@
     <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <reference-type-def kind='lvalue' type-id='type-id-1538' size-in-bits='64' id='type-id-1541'/>
     <reference-type-def kind='lvalue' type-id='type-id-1740' size-in-bits='64' id='type-id-3678'/>
-    <qualified-type-def type-id='type-id-1841' const='yes' id='type-id-1843'/>
+    <qualified-type-def type-id='type-id-1812' const='yes' id='type-id-1814'/>
     <reference-type-def kind='lvalue' type-id='type-id-1749' size-in-bits='64' id='type-id-3679'/>
-    <qualified-type-def type-id='type-id-1844' const='yes' id='type-id-1846'/>
+    <qualified-type-def type-id='type-id-1815' const='yes' id='type-id-1817'/>
     <reference-type-def kind='lvalue' type-id='type-id-1761' size-in-bits='64' id='type-id-3680'/>
-    <qualified-type-def type-id='type-id-1854' const='yes' id='type-id-1856'/>
+    <qualified-type-def type-id='type-id-1825' const='yes' id='type-id-1827'/>
     <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1676'/>
     <reference-type-def kind='lvalue' type-id='type-id-1675' size-in-bits='64' id='type-id-3681'/>
     <pointer-type-def type-id='type-id-3682' size-in-bits='64' id='type-id-3683'/>
     <pointer-type-def type-id='type-id-3684' size-in-bits='64' id='type-id-3685'/>
-    <qualified-type-def type-id='type-id-1606' const='yes' id='type-id-3686'/>
+    <qualified-type-def type-id='type-id-1607' const='yes' id='type-id-3686'/>
     <pointer-type-def type-id='type-id-3687' size-in-bits='64' id='type-id-3688'/>
     <qualified-type-def type-id='type-id-1708' id='type-id-1706'/>
     <reference-type-def kind='lvalue' type-id='type-id-1704' size-in-bits='64' id='type-id-1708'/>
@@ -53522,7 +53522,7 @@
     <pointer-type-def type-id='type-id-3697' size-in-bits='64' id='type-id-3698'/>
     <namespace-decl name='std'>
       <class-decl name='collate_byname&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='760' column='1' id='type-id-3684'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1647'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1648'/>
         <member-function access='private'>
           <function-decl name='collate_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3685' is-artificial='yes'/>
@@ -53602,7 +53602,7 @@
         </member-function>
       </class-decl>
       <class-decl name='messages_byname&lt;wchar_t&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1879' column='1' id='type-id-3687'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1649'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1650'/>
         <member-function access='private'>
           <function-decl name='messages_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/messages_members.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3688' is-artificial='yes'/>
@@ -53642,7 +53642,7 @@
         </member-function>
       </class-decl>
       <class-decl name='numpunct_byname&lt;wchar_t&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1876' column='1' id='type-id-3693'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1659'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1660'/>
         <member-function access='private'>
           <function-decl name='numpunct_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1883' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3694' is-artificial='yes'/>
@@ -53682,7 +53682,7 @@
         </member-function>
       </class-decl>
       <class-decl name='moneypunct_byname&lt;wchar_t, true&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1324' column='1' id='type-id-3691'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1657'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1658'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-272' mangled-name='_ZNSt17moneypunct_bynameIwLb1EE4intlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1330' column='1' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb1EE4intlE@@GLIBCXX_3.4'/>
         </data-member>
@@ -53725,7 +53725,7 @@
         </member-function>
       </class-decl>
       <class-decl name='moneypunct_byname&lt;wchar_t, false&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1324' column='1' id='type-id-3689'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1656'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1657'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-272' mangled-name='_ZNSt17moneypunct_bynameIwLb0EE4intlE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1330' column='1' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb0EE4intlE@@GLIBCXX_3.4'/>
         </data-member>
@@ -53768,7 +53768,7 @@
         </member-function>
       </class-decl>
       <class-decl name='time_put_byname&lt;wchar_t, std::ostreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='811' column='1' id='type-id-3697'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1664'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1665'/>
         <member-function access='private'>
           <function-decl name='time_put_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='819' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3698' is-artificial='yes'/>
@@ -53808,7 +53808,7 @@
         </member-function>
       </class-decl>
       <class-decl name='time_get_byname&lt;wchar_t, std::istreambuf_iterator&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='686' column='1' id='type-id-3695'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1662'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1663'/>
         <member-function access='private'>
           <function-decl name='time_get_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3696' is-artificial='yes'/>
@@ -53872,10 +53872,10 @@
         <return type-id='type-id-10'/>
       </function-decl>
       <function-decl name='__write&lt;wchar_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1478'/>
+        <parameter type-id='type-id-1477'/>
         <parameter type-id='type-id-395'/>
         <parameter type-id='type-id-6'/>
-        <return type-id='type-id-1478'/>
+        <return type-id='type-id-1477'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt5ctypeIwEERKT_RKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9use_facetISt5ctypeIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-1175' name='__loc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.tcc' line='130' column='1'/>
@@ -54099,94 +54099,94 @@
     <qualified-type-def type-id='type-id-3704' const='yes' id='type-id-3717'/>
     <pointer-type-def type-id='type-id-3717' size-in-bits='64' id='type-id-3718'/>
     <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1785'/>
-    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-1621'/>
-    <qualified-type-def type-id='type-id-1621' const='yes' id='type-id-1334'/>
+    <pointer-type-def type-id='type-id-1785' size-in-bits='64' id='type-id-1622'/>
+    <qualified-type-def type-id='type-id-1622' const='yes' id='type-id-1333'/>
     <pointer-type-def type-id='type-id-3715' size-in-bits='64' id='type-id-3719'/>
     <pointer-type-def type-id='type-id-3705' size-in-bits='64' id='type-id-3720'/>
-    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1332'/>
-    <qualified-type-def type-id='type-id-1332' const='yes' id='type-id-1335'/>
-    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1333'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-1331'/>
+    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1334'/>
+    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1332'/>
     <namespace-decl name='std'>
       <typedef-decl name='__c_lock' type-id='type-id-76' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++io.h' line='43' column='1' id='type-id-1291'/>
       <class-decl name='__basic_file&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='54' column='1' id='type-id-1282'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_cfile' type-id='type-id-1331' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='57' column='1'/>
+          <var-decl name='_M_cfile' type-id='type-id-1330' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='57' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_cfile_created' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='60' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__basic_file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-1332'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__basic_file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__basic_file' mangled-name='_ZNSt12__basic_fileIcEC2EP15pthread_mutex_t' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcEC2EP15pthread_mutex_t@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-1332'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt12__basic_fileIcE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12__basic_fileIcE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1333' name='this' is-artificial='yes'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__name' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1'/>
             <parameter type-id='type-id-1151' name='__mode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='231' column='1'/>
             <parameter type-id='type-id-6'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sys_open' mangled-name='_ZNSt12__basic_fileIcE8sys_openEiSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8sys_openEiSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-6' name='__fd' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1'/>
             <parameter type-id='type-id-1151' name='__mode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='215' column='1'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='fd' mangled-name='_ZNSt12__basic_fileIcE2fdEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='file' mangled-name='_ZNSt12__basic_fileIcE4fileEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1331'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1330'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt12__basic_fileIcE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__basic_file' mangled-name='_ZNSt12__basic_fileIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='xsgetn' mangled-name='_ZNSt12__basic_fileIcE6xsgetnEPcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsgetnEPcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-98' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1'/>
             <parameter type-id='type-id-1168' name='__n' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='289' column='1'/>
             <return type-id='type-id-1168'/>
@@ -54194,7 +54194,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='xsputn' mangled-name='_ZNSt12__basic_fileIcE6xsputnEPKcl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsputnEPKcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1'/>
             <parameter type-id='type-id-1168' name='__n' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='299' column='1'/>
             <return type-id='type-id-1168'/>
@@ -54202,7 +54202,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='xsputn_2' mangled-name='_ZNSt12__basic_fileIcE8xsputn_2EPKclS2_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8xsputn_2EPKclS2_l@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-4' name='__s1' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1'/>
             <parameter type-id='type-id-1168' name='__n1' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='303' column='1'/>
             <parameter type-id='type-id-4' name='__s2' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='304' column='1'/>
@@ -54212,7 +54212,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='seekoff' mangled-name='_ZNSt12__basic_fileIcE7seekoffElSt12_Ios_Seekdir' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE7seekoffElSt12_Ios_Seekdir@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <parameter type-id='type-id-1275' name='__off' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1'/>
             <parameter type-id='type-id-1153' name='__way' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='320' column='1'/>
             <return type-id='type-id-1275'/>
@@ -54220,21 +54220,21 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='sync' mangled-name='_ZNSt12__basic_fileIcE4syncEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-6'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='sys_open' mangled-name='_ZNSt12__basic_fileIcE8sys_openEP8_IO_FILESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE8sys_openEP8_IO_FILESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
-            <parameter type-id='type-id-1331' name='__file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1330' name='__file' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='194' column='1'/>
             <parameter type-id='type-id-1151'/>
-            <return type-id='type-id-1332'/>
+            <return type-id='type-id-1331'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='showmanyc' mangled-name='_ZNSt12__basic_fileIcE9showmanycEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/basic_file.cc' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE9showmanycEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-1335' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' name='this' is-artificial='yes'/>
             <return type-id='type-id-1168'/>
           </function-decl>
         </member-function>
@@ -54366,12 +54366,12 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='c++locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1340' const='yes' id='type-id-3722'/>
+    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-3722'/>
     <qualified-type-def type-id='type-id-3723' id='type-id-3724'/>
     <reference-type-def kind='lvalue' type-id='type-id-3722' size-in-bits='64' id='type-id-3723'/>
-    <qualified-type-def type-id='type-id-1643' id='type-id-1401'/>
-    <qualified-type-def type-id='type-id-1456' id='type-id-1453'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1456'/>
+    <qualified-type-def type-id='type-id-1644' id='type-id-1400'/>
+    <qualified-type-def type-id='type-id-1455' id='type-id-1452'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1455'/>
     <namespace-decl name='std'>
       <class-decl name='numeric_limits&lt;float&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1553' column='1' id='type-id-3725'>
         <data-member access='public' static='yes'>
@@ -54589,21 +54589,21 @@
       <function-decl name='__convert_to_v&lt;float&gt;' mangled-name='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1'/>
         <parameter type-id='type-id-1207' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1'/>
-        <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1'/>
+        <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1'/>
         <parameter type-id='type-id-3724' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='45' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__convert_to_v&lt;double&gt;' mangled-name='_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='71' column='1'/>
         <parameter type-id='type-id-1208' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='71' column='1'/>
-        <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='71' column='1'/>
+        <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='71' column='1'/>
         <parameter type-id='type-id-3724' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='72' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__convert_to_v&lt;long double&gt;' mangled-name='_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4'>
         <parameter type-id='type-id-4' name='__s' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='98' column='1'/>
         <parameter type-id='type-id-1209' name='__v' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='98' column='1'/>
-        <parameter type-id='type-id-1453' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='98' column='1'/>
+        <parameter type-id='type-id-1452' name='__err' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='98' column='1'/>
         <parameter type-id='type-id-3724' name='__cloc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='99' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
@@ -54667,11 +54667,11 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='collate_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1811'/>
-    <pointer-type-def type-id='type-id-1811' size-in-bits='64' id='type-id-1681'/>
+    <qualified-type-def type-id='type-id-1647' const='yes' id='type-id-1841'/>
+    <pointer-type-def type-id='type-id-1841' size-in-bits='64' id='type-id-1681'/>
     <qualified-type-def type-id='type-id-1681' const='yes' id='type-id-1680'/>
-    <qualified-type-def type-id='type-id-1647' const='yes' id='type-id-1812'/>
-    <pointer-type-def type-id='type-id-1812' size-in-bits='64' id='type-id-1684'/>
+    <qualified-type-def type-id='type-id-1648' const='yes' id='type-id-1842'/>
+    <pointer-type-def type-id='type-id-1842' size-in-bits='64' id='type-id-1684'/>
     <qualified-type-def type-id='type-id-1684' const='yes' id='type-id-1683'/>
     <function-decl name='__strcoll_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
@@ -54703,7 +54703,7 @@
   <abi-instr address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
   </abi-instr>
   <abi-instr address-size='64' path='ctype_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1392' const='yes' id='type-id-1390'/>
+    <qualified-type-def type-id='type-id-1391' const='yes' id='type-id-1389'/>
     <pointer-type-def type-id='type-id-3728' size-in-bits='64' id='type-id-3729'/>
     <namespace-decl name='std'>
       <class-decl name='ctype_byname&lt;char&gt;' size-in-bits='4608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1484' column='1' id='type-id-3728'>
@@ -54770,14 +54770,14 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='messages_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1648' const='yes' id='type-id-1813'/>
-    <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1687'/>
-    <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1815'/>
-    <pointer-type-def type-id='type-id-1815' size-in-bits='64' id='type-id-1692'/>
+    <qualified-type-def type-id='type-id-1649' const='yes' id='type-id-1843'/>
+    <pointer-type-def type-id='type-id-1843' size-in-bits='64' id='type-id-1687'/>
+    <qualified-type-def type-id='type-id-1650' const='yes' id='type-id-1845'/>
+    <pointer-type-def type-id='type-id-1845' size-in-bits='64' id='type-id-1692'/>
     <qualified-type-def type-id='type-id-1692' const='yes' id='type-id-1693'/>
-    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1878'/>
-    <qualified-type-def type-id='type-id-1816' id='type-id-1694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1878' size-in-bits='64' id='type-id-1816'/>
+    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1881'/>
+    <qualified-type-def type-id='type-id-1846' id='type-id-1694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1881' size-in-bits='64' id='type-id-1846'/>
     <namespace-decl name='std'>
       <class-decl name='messages_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1668' column='1' id='type-id-1685'>
         <member-type access='public'>
@@ -54792,10 +54792,10 @@
   </abi-instr>
   <abi-instr address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <typedef-decl name='nl_item' type-id='type-id-6' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-3730'/>
-    <qualified-type-def type-id='type-id-1417' const='yes' id='type-id-1729'/>
-    <qualified-type-def type-id='type-id-1418' const='yes' id='type-id-1737'/>
-    <qualified-type-def type-id='type-id-1429' const='yes' id='type-id-1744'/>
-    <qualified-type-def type-id='type-id-1430' const='yes' id='type-id-1751'/>
+    <qualified-type-def type-id='type-id-1416' const='yes' id='type-id-1729'/>
+    <qualified-type-def type-id='type-id-1417' const='yes' id='type-id-1737'/>
+    <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1744'/>
+    <qualified-type-def type-id='type-id-1429' const='yes' id='type-id-1751'/>
     <function-decl name='__nl_langinfo_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3730'/>
       <parameter type-id='type-id-1667'/>
@@ -54803,18 +54803,18 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1413' const='yes' id='type-id-1758'/>
-    <qualified-type-def type-id='type-id-1425' const='yes' id='type-id-1765'/>
+    <qualified-type-def type-id='type-id-1412' const='yes' id='type-id-1758'/>
+    <qualified-type-def type-id='type-id-1424' const='yes' id='type-id-1765'/>
   </abi-instr>
   <abi-instr address-size='64' path='time_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-1644' const='yes' id='type-id-1873'/>
-    <pointer-type-def type-id='type-id-1873' size-in-bits='64' id='type-id-1807'/>
-    <qualified-type-def type-id='type-id-1807' const='yes' id='type-id-1672'/>
-    <qualified-type-def type-id='type-id-1645' const='yes' id='type-id-1874'/>
-    <pointer-type-def type-id='type-id-1874' size-in-bits='64' id='type-id-1808'/>
-    <qualified-type-def type-id='type-id-1808' const='yes' id='type-id-1677'/>
-    <qualified-type-def type-id='type-id-1421' const='yes' id='type-id-1673'/>
-    <qualified-type-def type-id='type-id-1433' const='yes' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-1645' const='yes' id='type-id-1876'/>
+    <pointer-type-def type-id='type-id-1876' size-in-bits='64' id='type-id-1837'/>
+    <qualified-type-def type-id='type-id-1837' const='yes' id='type-id-1672'/>
+    <qualified-type-def type-id='type-id-1646' const='yes' id='type-id-1877'/>
+    <pointer-type-def type-id='type-id-1877' size-in-bits='64' id='type-id-1838'/>
+    <qualified-type-def type-id='type-id-1838' const='yes' id='type-id-1677'/>
+    <qualified-type-def type-id='type-id-1420' const='yes' id='type-id-1673'/>
+    <qualified-type-def type-id='type-id-1432' const='yes' id='type-id-1678'/>
     <function-decl name='__strftime_l' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/x86_64-unknown-linux-gnu/bits/c++locale_internal.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-98'/>
       <parameter type-id='type-id-99'/>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index edc136b4..c0b88ad0 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -1771,21 +1771,6 @@
       <parameter type-id='type-id-97'/>
       <return type-id='type-id-21'/>
     </function-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-136' size-in-bits='64' id='type-id-132'/>
-    <qualified-type-def type-id='type-id-124' const='yes' id='type-id-128'/>
-    <function-type size-in-bits='64' id='type-id-105'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-11'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-112'>
-      <return type-id='type-id-19'/>
-    </function-type>
-    <array-type-def dimensions='1' type-id='type-id-124' size-in-bits='infinite' id='type-id-129'>
-      <subrange length='infinite' type-id='type-id-4' id='type-id-137'/>
-    </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-131'/>
     <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-31'/>
     <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-106'/>
     <namespace-decl name='std'>
@@ -1793,7 +1778,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='95' column='1' id='type-id-135'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-136'/>
       </class-decl>
     </namespace-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-24'>
@@ -1801,10 +1786,25 @@
         <var-decl name='__count' type-id='type-id-11' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-139' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+        <var-decl name='__value' type-id='type-id-137' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-40' visibility='default' is-declaration-only='yes' id='type-id-42'/>
+    <reference-type-def kind='lvalue' type-id='type-id-138' size-in-bits='64' id='type-id-132'/>
+    <qualified-type-def type-id='type-id-124' const='yes' id='type-id-128'/>
+    <function-type size-in-bits='64' id='type-id-105'>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-11'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-112'>
+      <return type-id='type-id-19'/>
+    </function-type>
+    <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-133'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-131'/>
+    <array-type-def dimensions='1' type-id='type-id-124' size-in-bits='infinite' id='type-id-129'>
+      <subrange length='infinite' type-id='type-id-4' id='type-id-139'/>
+    </array-type-def>
     <typedef-decl name='_Atomic_word' type-id='type-id-11' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h' line='32' column='1' id='type-id-130'/>
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-140'>
@@ -1813,16 +1813,16 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-136'/>
     <namespace-decl name='std'>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-138'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-136'/>
     </namespace-decl>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-138'/>
     <namespace-decl name='std'>
       <typedef-decl name='size_t' type-id='type-id-17' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-141'/>
     </namespace-decl>
     <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-24'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-139'>
+        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-137'>
           <data-member access='private'>
             <var-decl name='__wch' type-id='type-id-7' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
@@ -1842,13 +1842,13 @@
   </abi-instr>
   <abi-instr address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='infinite' id='type-id-143'>
-      <subrange length='infinite' type-id='type-id-4' id='type-id-137'/>
+      <subrange length='infinite' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='infinite' id='type-id-145'>
-      <subrange length='infinite' type-id='type-id-4' id='type-id-137'/>
+      <subrange length='infinite' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-124' size-in-bits='infinite' id='type-id-129'>
-      <subrange length='infinite' type-id='type-id-4' id='type-id-137'/>
+      <subrange length='infinite' type-id='type-id-4' id='type-id-139'/>
     </array-type-def>
     <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-146'/>
     <typedef-decl name='_Atomic_word' type-id='type-id-11' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h' line='32' column='1' id='type-id-130'/>
@@ -1972,8 +1972,8 @@
     <qualified-type-def type-id='type-id-292' const='yes' id='type-id-293'/>
     <qualified-type-def type-id='type-id-294' const='yes' id='type-id-295'/>
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-296'/>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-136'/>
-    <reference-type-def kind='lvalue' type-id='type-id-136' size-in-bits='64' id='type-id-132'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-138'/>
+    <reference-type-def kind='lvalue' type-id='type-id-138' size-in-bits='64' id='type-id-132'/>
     <qualified-type-def type-id='type-id-123' const='yes' id='type-id-297'/>
     <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
     <qualified-type-def type-id='type-id-126' const='yes' id='type-id-299'/>
@@ -3795,12 +3795,12 @@
       <class-decl name='__false_type' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/cpp_type_traits.h' line='83' column='1' id='type-id-134'/>
       <typedef-decl name='ptrdiff_t' type-id='type-id-13' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-395'/>
       <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='95' column='1' id='type-id-135'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-136'/>
       </class-decl>
       <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='99' column='1' id='type-id-396'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-135'/>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-138'/>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-136'/>
       <class-decl name='random_access_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='103' column='1' id='type-id-397'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-396'/>
       </class-decl>
@@ -5272,7 +5272,7 @@
         <var-decl name='__count' type-id='type-id-11' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-139' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+        <var-decl name='__value' type-id='type-id-137' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-501'/>
